diff --git a/base/pkgconfig/pkg-config-0.23-sysroot.patch b/base/pkgconfig/pkg-config-0.23-sysroot.patch index 64c53dd78..d22307979 100644 --- a/base/pkgconfig/pkg-config-0.23-sysroot.patch +++ b/base/pkgconfig/pkg-config-0.23-sysroot.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../pkgconfig/pkg-config-0.23-sysroot.patch -# Copyright (C) 2008 The OpenSDE Project +# Copyright (C) 2009 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -14,29 +14,27 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- -http://lists.freedesktop.org/archives/pkg-config/2008-January/000255.html -pkg-config 0.23 PKG_CONFIG_SYSROOT_DIR bug -Paul Bender -Tue Jan 22 20:04:41 PST 2008 +https://bugs.freedesktop.org/attachment.cgi?id=21210 -There appears to be a bug in the handling of the new -PKG_CONFIG_SYSROOT_DIR. When PKG_CONFIG_SYSROOT_DIR is set, on the all -but the -I and -L options are removed from --cflags and --libs -respectively. This does not seem like the right behavior. - -I have attached a patch that fixes the problem for me. - -diff -Naur pkg-config-0.23-old/pkg.c pkg-config-0.23-new/pkg.c ---- pkg-config-0.23-old/pkg.c 2008-01-16 13:59:49.000000000 -0800 -+++ pkg-config-0.23-new/pkg.c 2008-01-22 15:00:55.000000000 -0800 -@@ -483,6 +483,10 @@ +--- a/pkg.c 2008-01-16 13:59:49.000000000 -0800 ++++ b/pkg.c 2008-12-16 10:23:15.000000000 -0800 +@@ -472,9 +472,8 @@ + while (tmp != NULL) + { + char *tmpstr = (char*) tmp->data; +- if (pcsysrootdir != NULL) +- { +- if (tmpstr[0] == '-' && ++ if (pcsysrootdir != NULL && ++ tmpstr[0] == '-' && + (tmpstr[1] == 'I' || + tmpstr[1] == 'L')) + { +@@ -483,7 +482,6 @@ g_string_append (str, pcsysrootdir); g_string_append (str, tmpstr+2); } -+ else -+ { -+ g_string_append (str, tmpstr); -+ } - } +- } else { + g_string_append (str, tmpstr);