summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorMichael J. Hammel <mjhammel@graphics-muse.org>2011-04-23 20:51:41 -0600
committerPeter Korsgaard <jacmet@sunsite.dk>2011-08-04 22:13:37 +0200
commit5496bc399bc9eee202dbd7bd1d143722f30536e9 (patch)
tree61ad3f39a99b4723c0f42cefd1ca522b7c067252 /package
parent5255a7197b858c4cb5632e12d2097b75b68518e7 (diff)
pkg-config: Add "mapdir" to sysroot handled variables
Closes #3583, #3649 Fixes xfonts_font-adobe build failure. Signed-off-by: Michael J. Hammel <mjhammel@graphics-muse.org> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package')
-rw-r--r--package/pkg-config/pkg-config-0.25-fix-variable.patch7
1 files changed, 4 insertions, 3 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
index 0b1d4a9d8..13a2b9191 100644
--- a/package/pkg-config/pkg-config-0.25-fix-variable.patch
+++ b/package/pkg-config/pkg-config-0.25-fix-variable.patch
@@ -8,20 +8,21 @@ so ensure the sysroot'ed files are used.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
- main.c | 5 +++++
- 1 file changed, 5 insertions(+)
+ main.c | 6 +++++
+ 1 file changed, 6 insertions(+)
Index: pkg-config-0.25/main.c
===================================================================
--- pkg-config-0.25.orig/main.c
+++ pkg-config-0.25/main.c
-@@ -700,6 +700,11 @@
+@@ -700,6 +700,12 @@
if (variable_name)
{
char *str = packages_get_var (packages, variable_name);
+ /* include/lib variable? */
+ if (pcsysrootdir &&
+ (!strcmp(variable_name, "includedir") ||
++ !strcmp(variable_name, "mapdir") ||
+ !strcmp(variable_name, "libdir")))
+ printf ("%s/", pcsysrootdir);
printf ("%s", str);