summaryrefslogtreecommitdiff
path: root/package/pkg-config/pkg-config-0.23-fix-sysroot.patch
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-04-17 15:55:16 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2009-04-17 15:55:16 +0000
commit23795ec71f546c4d89b911f67d539393d92059ce (patch)
tree16685b59334f636ec94b2ff2cd14eab2391567f0 /package/pkg-config/pkg-config-0.23-fix-sysroot.patch
parent475bf3a83acf6a8e2a376ab8e170f403e9918c6a (diff)
pkg-config: fix target package
As reported by Sven Neumann on the list.
Diffstat (limited to 'package/pkg-config/pkg-config-0.23-fix-sysroot.patch')
-rw-r--r--package/pkg-config/pkg-config-0.23-fix-sysroot.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/package/pkg-config/pkg-config-0.23-fix-sysroot.patch b/package/pkg-config/pkg-config-0.23-fix-sysroot.patch
new file mode 100644
index 000000000..36538112b
--- /dev/null
+++ b/package/pkg-config/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
+ {