From 117a8ea0eaabec72d7637f80f7a55fbba9ce67bf Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 10 Mar 2011 11:36:18 +0100 Subject: pkg-config: only prepend sysroot to includedir / libdir Only append sysroot to includedir / libdir, and not to other variables, when a variable is requested (--variable=), similar to how it is done for the -I / -L flags in cflags/ldflags. The problem is that pkg-config doesn't have any explicit cross compilation support, so there's some confusion about what are host paths and what are target ones. Includedir / libdir are paths for the (cross) compiler, so those should normally have sysroot prepended, but other variables might refer to target paths instead. This fixes the installation of the xfonts-* packages, which uses pkg-config --variable=fontrootdir fontutil to figure out the target installation location for fonts. Signed-off-by: Peter Korsgaard --- package/pkg-config/pkg-config-0.25-fix-variable.patch | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 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 46b262bbc..0b1d4a9d8 100644 --- a/package/pkg-config/pkg-config-0.25-fix-variable.patch +++ b/package/pkg-config/pkg-config-0.25-fix-variable.patch @@ -1,26 +1,28 @@ -[PATCH] prefix sysroot to path variables +[PATCH] prefix sysroot to include/libdir path variables -Prefix path values with sysroot if a variable is requested -(--varable=), similar to how it's done for -I / -L flags. +Prefix includedir / libdir variable values with sysroot if a variable is +requested (--variable=), 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 --- - main.c | 3 +++ - 1 file changed, 3 insertions(+) + main.c | 5 +++++ + 1 file changed, 5 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) +@@ -700,6 +700,11 @@ if (variable_name) { char *str = packages_get_var (packages, variable_name); -+ /* path variable? */ -+ if (pcsysrootdir && str[0] == '/') ++ /* include/lib variable? */ ++ if (pcsysrootdir && ++ (!strcmp(variable_name, "includedir") || ++ !strcmp(variable_name, "libdir"))) + printf ("%s/", pcsysrootdir); printf ("%s", str); g_free (str); -- cgit v1.2.3-55-g7522