summaryrefslogtreecommitdiffstats
path: root/meta
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-10 10:47:45 +0000
commit72ee285fbe7a72f84a14cf6c9f2ab83b22821783 (patch)
tree4a3f985d67f95cbb48417c10351748c77e92cc31 /meta
parent8732930521616134e537d00a34a195a3197a5488 (diff)
downloadpoky-72ee285fbe7a72f84a14cf6c9f2ab83b22821783.tar.gz
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. (From OE-Core rev: df3ecaf86360a9c109b1b19bfa8a52890315bbdc) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 0000000000..84d0dd8ca7
--- /dev/null
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/0001-Strip-system-library-directories-reliably.patch
@@ -0,0 +1,30 @@
1Upstream-Status: Backport (will be in 0.29)
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From ce1a2416ce0f0bd9a8a8a5caaf7dad20cda4d47d Mon Sep 17 00:00:00 2001
5From: Andrew Oakley <aoakley@espial.com>
6Date: Tue, 29 Apr 2014 13:14:35 +0100
7Subject: [PATCH] Strip system library directories reliably
8
9This loop was changed from a while loop to a for loop in commit
109bf6277b, but the iterator is now advanced twice each time round the
11loop.
12---
13 pkg.c | 1 -
14 1 file changed, 1 deletion(-)
15
16diff --git a/pkg.c b/pkg.c
17index 3697fec..c847c95 100644
18--- a/pkg.c
19+++ b/pkg.c
20@@ -917,7 +917,6 @@ verify_package (Package *pkg)
21 }
22 system_dir_iter = system_dir_iter->next;
23 }
24- iter = iter->next;
25 }
26 g_list_free (system_directories);
27
28--
291.7.10.4
30
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
index 3070da99d3..57a22d4c78 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 += " \
4 file://pkg-config-native.in \ 4 file://pkg-config-native.in \
5 file://fix-glib-configure-libtool-usage.patch \ 5 file://fix-glib-configure-libtool-usage.patch \
6 file://obsolete_automake_macros.patch \ 6 file://obsolete_automake_macros.patch \
7 file://0001-Strip-system-library-directories-reliably.patch \
7 " 8 "
8 9
9SRC_URI[md5sum] = "aa3c86e67551adc3ac865160e34a2a0d" 10SRC_URI[md5sum] = "aa3c86e67551adc3ac865160e34a2a0d"