From cd22fcc461abb68f9f901433c3489bc562e3fa99 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 26 Mar 2008 22:37:55 +0000 Subject: pkgconfig: Fix problems with the sysroot implementation merged upstream, switch pkgconfig to link against an external glib-2.0 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4126 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../pkgconfig/pkgconfig-0.23/sysrootfix.patch | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 meta/packages/pkgconfig/pkgconfig-0.23/sysrootfix.patch (limited to 'meta/packages/pkgconfig/pkgconfig-0.23') diff --git a/meta/packages/pkgconfig/pkgconfig-0.23/sysrootfix.patch b/meta/packages/pkgconfig/pkgconfig-0.23/sysrootfix.patch new file mode 100644 index 000000000..c5ee82e9a --- /dev/null +++ b/meta/packages/pkgconfig/pkgconfig-0.23/sysrootfix.patch @@ -0,0 +1,31 @@ +Index: pkg-config-0.23/pkg.c +=================================================================== +--- pkg-config-0.23.orig/pkg.c 2008-03-26 22:18:39.000000000 +0000 ++++ pkg-config-0.23/pkg.c 2008-03-26 22:31:11.000000000 +0000 +@@ -472,19 +472,15 @@ + while (tmp != NULL) + { + char *tmpstr = (char*) tmp->data; +- if (pcsysrootdir != NULL) ++ if (pcsysrootdir != NULL && tmpstr[0] == '-' && ++ (tmpstr[1] == 'I' || tmpstr[1] == 'L')) + { +- if (tmpstr[0] == '-' && +- (tmpstr[1] == 'I' || +- tmpstr[1] == 'L')) +- { +- g_string_append_c (str, '-'); +- g_string_append_c (str, tmpstr[1]); +- g_string_append (str, pcsysrootdir); +- g_string_append (str, tmpstr+2); +- } ++ g_string_append_c (str, '-'); ++ g_string_append_c (str, tmpstr[1]); ++ g_string_append (str, pcsysrootdir); ++ g_string_append (str, tmpstr+2); + } +- else ++ else + { + g_string_append (str, tmpstr); + } -- cgit v1.2.3