From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Petazzoni Date: Tue, 4 Jul 2017 16:49:13 +0200 Subject: [Buildroot] [PATCH 093/100] popt: remove libintl static linking handling In-Reply-To: <20170704144920.12318-1-thomas.petazzoni@free-electrons.com> References: <20170704144920.12318-1-thomas.petazzoni@free-electrons.com> Message-ID: <20170704144920.12318-94-thomas.petazzoni@free-electrons.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net We no longer support building the full-blown libintl in static linking scenarios, as it causes too many problems. Therefore, remove the patch that was handling this. Signed-off-by: Thomas Petazzoni --- ...-the-libintl-library-to-the-Libs.private-.patch | 47 ---------------------- 1 file changed, 47 deletions(-) delete mode 100644 package/popt/0004-popt.pc-add-the-libintl-library-to-the-Libs.private-.patch diff --git a/package/popt/0004-popt.pc-add-the-libintl-library-to-the-Libs.private-.patch b/package/popt/0004-popt.pc-add-the-libintl-library-to-the-Libs.private-.patch deleted file mode 100644 index 9b0b07e..0000000 --- a/package/popt/0004-popt.pc-add-the-libintl-library-to-the-Libs.private-.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 470755ccc353b59107c957972d908cbde4942c8d Mon Sep 17 00:00:00 2001 -From: Fabio Porcedda -Date: Sun, 1 Mar 2015 21:13:48 +0100 -Subject: [PATCH] popt.pc: add the libintl library to the Libs.private field - -If static linking and libintl is used, the program that uses the popt -library needs to link to the libintl library too so add the libintl -library to the libs.private field because is useful for programs that call - pkg-config --static --libs popt -they get the libintl library too: - -L<...> -lpopt -lintl - -This patch was already sent upstream: -http://rpm5.org/community/popt-devel/0294.html - -Signed-off-by: Fabio Porcedda ---- - configure.ac | 1 + - popt.pc.in | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/configure.ac b/configure.ac -index e8eb238..816d272 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -90,6 +90,7 @@ popt_sysconfdir="${sysconfdir}" - eval "popt_sysconfdir=\"${popt_sysconfdir}\"" # expand contained ${prefix} - AC_DEFINE_UNQUOTED([POPT_SYSCONFDIR], ["$popt_sysconfdir"], [Full path to default POPT configuration directory]) - -+AC_SUBST([POPT_PKGCONFIG_LIBS_PRIVATE],"$LIBINTL") - - # Define a (hope) portable Libs pkgconfig directive that - # - Don't harm if the default library search path include ${libdir} -diff --git a/popt.pc.in b/popt.pc.in -index a86437c..0acfdb9 100644 ---- a/popt.pc.in -+++ b/popt.pc.in -@@ -6,5 +6,6 @@ includedir=@includedir@ - Name: popt - Version: @VERSION@ - Description: popt library. -+Libs.private: @POPT_PKGCONFIG_LIBS_PRIVATE@ - Libs: @POPT_PKGCONFIG_LIBS@ - Cflags: -I${includedir} --- -2.3.1 - -- 2.9.4