From 5496bc399bc9eee202dbd7bd1d143722f30536e9 Mon Sep 17 00:00:00 2001 From: "Michael J. Hammel" Date: Sat, 23 Apr 2011 20:51:41 -0600 Subject: pkg-config: Add "mapdir" to sysroot handled variables Closes #3583, #3649 Fixes xfonts_font-adobe build failure. Signed-off-by: Michael J. Hammel Signed-off-by: Peter Korsgaard --- package/pkg-config/pkg-config-0.25-fix-variable.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'package/pkg-config') 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 --- - 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); -- cgit v1.2.3