From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 29 Jan 2011 21:59:44 +0000 (+0100)
Subject: pkg-config: prefix sysroot to path variables
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b4df2ea27fc28734978ff8a52811dc23d5d1c221;p=buildroot.git

pkg-config: prefix sysroot to path variables

Fixes gst-plugins-bad build, if gstreamer is installed on host with xml
support, as it uses pkg-config --variable=includedir to find gstconfig.h,
and hence ends up looking at the host version.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---

diff --git a/package/pkg-config/pkg-config-0.25-fix-variable.patch b/package/pkg-config/pkg-config-0.25-fix-variable.patch
new file mode 100644
index 0000000000..46b262bbcb
--- /dev/null
+++ b/package/pkg-config/pkg-config-0.25-fix-variable.patch
@@ -0,0 +1,27 @@
+[PATCH] prefix sysroot to path variables
+
+Prefix path values with sysroot if a variable is requested
+(--varable=<name>), similar to how it's done for -I / -L flags.
+
+This is sometimes used to find header files (E.G. in gst-plugins configure),
+so ensure the sysroot'ed files are used.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ main.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+Index: pkg-config-0.25/main.c
+===================================================================
+--- pkg-config-0.25.orig/main.c
++++ pkg-config-0.25/main.c
+@@ -695,6 +695,9 @@ main (int argc, char **argv)
+   if (variable_name)
+     {
+       char *str = packages_get_var (packages, variable_name);
++      /* path variable? */
++      if (pcsysrootdir && str[0] == '/')
++          printf ("%s/", pcsysrootdir);
+       printf ("%s", str);
+       g_free (str);
+       need_newline = TRUE;