aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-01-22 17:27:38 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-09 16:00:21 +0000
commitdf3ecaf86360a9c109b1b19bfa8a52890315bbdc (patch)
treee3d35a1a102e7eb20e5ef2a01fef7c2df1fbb25f
parentf50c4c4e26edeaf01393fe7a06c42f86fd4680a5 (diff)
downloadopenembedded-core-contrib-df3ecaf86360a9c109b1b19bfa8a52890315bbdc.tar.gz
openembedded-core-contrib-df3ecaf86360a9c109b1b19bfa8a52890315bbdc.tar.bz2
openembedded-core-contrib-df3ecaf86360a9c109b1b19bfa8a52890315bbdc.zip
pkg-config: strip system library paths reliably
pkg-config was skipping every other link flag due to a list manipulation bug, backport a commit from git to fix this. This will stop users of zlib.pc from inserting the sysroot directory indirectly into builds. Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig-0.28/0001-Strip-system-library-directories-reliably.patch30
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb1
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/0001-Strip-system-library-directories-reliably.patch b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/0001-Strip-system-library-directories-reliably.patch
new file mode 100644
index 00000000000..84d0dd8ca7f
--- /dev/null
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/0001-Strip-system-library-directories-reliably.patch
@@ -0,0 +1,30 @@
+Upstream-Status: Backport (will be in 0.29)
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+From ce1a2416ce0f0bd9a8a8a5caaf7dad20cda4d47d Mon Sep 17 00:00:00 2001
+From: Andrew Oakley <aoakley@espial.com>
+Date: Tue, 29 Apr 2014 13:14:35 +0100
+Subject: [PATCH] Strip system library directories reliably
+
+This loop was changed from a while loop to a for loop in commit
+9bf6277b, but the iterator is now advanced twice each time round the
+loop.
+---
+ pkg.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/pkg.c b/pkg.c
+index 3697fec..c847c95 100644
+--- a/pkg.c
++++ b/pkg.c
+@@ -917,7 +917,6 @@ verify_package (Package *pkg)
+ }
+ system_dir_iter = system_dir_iter->next;
+ }
+- iter = iter->next;
+ }
+ g_list_free (system_directories);
+
+--
+1.7.10.4
+
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
index 3070da99d36..57a22d4c78a 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
@@ -4,6 +4,7 @@ SRC_URI += " \
file://pkg-config-native.in \
file://fix-glib-configure-libtool-usage.patch \
file://obsolete_automake_macros.patch \
+ file://0001-Strip-system-library-directories-reliably.patch \
"
SRC_URI[md5sum] = "aa3c86e67551adc3ac865160e34a2a0d"