summaryrefslogtreecommitdiffstats
path: root/package/pkgconfig/pkg-config-0.23-fix-sysroot.patch
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2008-06-14 21:00:59 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2008-06-14 21:00:59 +0000
commit6eb60364c44be5113ff39abb1e0cacece9595d81 (patch)
treede7d6d6f0185eecd5dc1102ee6ad9e1424e4caea /package/pkgconfig/pkg-config-0.23-fix-sysroot.patch
parente147608e7d951ee0873d0bf855e98dcbd0230830 (diff)
downloadbuildroot-novena-6eb60364c44be5113ff39abb1e0cacece9595d81.tar.gz
buildroot-novena-6eb60364c44be5113ff39abb1e0cacece9595d81.zip
pkgconfig: bump version and cleanup
Upgrade to pkgconfig 0.23 which has native sysroot support (buggy, but easily fixable), which allows us to get rid of pkgconfig-filter.sh. At the same time cleanup the makefile.
Diffstat (limited to 'package/pkgconfig/pkg-config-0.23-fix-sysroot.patch')
-rw-r--r--package/pkgconfig/pkg-config-0.23-fix-sysroot.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/package/pkgconfig/pkg-config-0.23-fix-sysroot.patch b/package/pkgconfig/pkg-config-0.23-fix-sysroot.patch
new file mode 100644
index 000000000..36538112b
--- /dev/null
+++ b/package/pkgconfig/pkg-config-0.23-fix-sysroot.patch
@@ -0,0 +1,34 @@
+[PATCH] fix PKG_CONFIG_SYSROOT_DIR handling
+
+With PKG_CONFIG_SYSROOT_DIR enabled, everything else than -L and -I words
+gets stripped away.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ pkg.c | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+Index: pkg-config-0.23/pkg.c
+===================================================================
+--- pkg-config-0.23.orig/pkg.c
++++ pkg-config-0.23/pkg.c
+@@ -472,17 +472,13 @@
+ while (tmp != NULL)
+ {
+ char *tmpstr = (char*) tmp->data;
+- if (pcsysrootdir != NULL)
++ if (pcsysrootdir != NULL && tmpstr[0] == '-' &&
++ (tmpstr[1] == 'I' || tmpstr[1] == 'L'))
+ {
+- if (tmpstr[0] == '-' &&
+- (tmpstr[1] == 'I' ||
+- tmpstr[1] == 'L'))
+- {
+ g_string_append_c (str, '-');
+ g_string_append_c (str, tmpstr[1]);
+ g_string_append (str, pcsysrootdir);
+ g_string_append (str, tmpstr+2);
+- }
+ }
+ else
+ {