summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2011-01-29 21:59:44 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-01-29 22:03:16 (GMT)
commitb4df2ea27fc28734978ff8a52811dc23d5d1c221 (patch)
tree50f184d2a6c06739d04863b45ac9482674bbca0e
parentd5da84fda9bf9478935e7a080491519ebc4197d3 (diff)
downloadbuildroot-b4df2ea27fc28734978ff8a52811dc23d5d1c221.tar.gz
buildroot-b4df2ea27fc28734978ff8a52811dc23d5d1c221.tar.bz2
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>
-rw-r--r--package/pkg-config/pkg-config-0.25-fix-variable.patch27
1 files changed, 27 insertions, 0 deletions
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 0000000..46b262b
--- /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;