aboutsummaryrefslogtreecommitdiff
path: root/package/pkgconf/pkgconf-fix-variable.patch
blob: e19f76c90cbf81eafc8dd487dc9668a0de087924 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
[PATCH] prefix sysroot to include/libdir path variables

Prefix includedir / libdir variable values with sysroot if a variable is
requested (--variable=<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: Gustavo Zacarias <gustavo@zacarias.com.ar>

diff -Nura pkgconf-0.8.9.orig/main.c pkgconf-0.8.9/main.c
--- pkgconf-0.8.9.orig/main.c	2012-10-24 14:32:08.236508699 -0300
+++ pkgconf-0.8.9/main.c	2012-10-24 14:54:36.771070217 -0300
@@ -298,7 +298,12 @@
 	if (eflag != PKG_ERRF_OK)
 		return false;
 
-	printf("%s\n", req.buf);
+	if ( !strcmp(req.variable, "includedir") ||
+	  !strcmp(req.variable, "mapdir") ||
+	  !strcmp(req.variable, "libdir"))
+		printf("%s%s\n", sysroot_dir, req.buf);
+	else
+		printf("%s\n", req.buf);
 	return true;
 }