diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-03-26 22:37:55 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-03-26 22:37:55 +0000 |
| commit | cd22fcc461abb68f9f901433c3489bc562e3fa99 (patch) | |
| tree | 3be39e26d651edd06e4ed129a46ff76423145b5c /meta/packages/pkgconfig/pkgconfig-0.23 | |
| parent | c3735c4462710b2c04ed4e2de90ab6bdfc148504 (diff) | |
| download | poky-cd22fcc461abb68f9f901433c3489bc562e3fa99.tar.gz | |
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
Diffstat (limited to 'meta/packages/pkgconfig/pkgconfig-0.23')
| -rw-r--r-- | meta/packages/pkgconfig/pkgconfig-0.23/sysrootfix.patch | 31 |
1 files changed, 31 insertions, 0 deletions
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 0000000000..c5ee82e9aa --- /dev/null +++ b/meta/packages/pkgconfig/pkgconfig-0.23/sysrootfix.patch | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | Index: pkg-config-0.23/pkg.c | ||
| 2 | =================================================================== | ||
| 3 | --- pkg-config-0.23.orig/pkg.c 2008-03-26 22:18:39.000000000 +0000 | ||
| 4 | +++ pkg-config-0.23/pkg.c 2008-03-26 22:31:11.000000000 +0000 | ||
| 5 | @@ -472,19 +472,15 @@ | ||
| 6 | while (tmp != NULL) | ||
| 7 | { | ||
| 8 | char *tmpstr = (char*) tmp->data; | ||
| 9 | - if (pcsysrootdir != NULL) | ||
| 10 | + if (pcsysrootdir != NULL && tmpstr[0] == '-' && | ||
| 11 | + (tmpstr[1] == 'I' || tmpstr[1] == 'L')) | ||
| 12 | { | ||
| 13 | - if (tmpstr[0] == '-' && | ||
| 14 | - (tmpstr[1] == 'I' || | ||
| 15 | - tmpstr[1] == 'L')) | ||
| 16 | - { | ||
| 17 | - g_string_append_c (str, '-'); | ||
| 18 | - g_string_append_c (str, tmpstr[1]); | ||
| 19 | - g_string_append (str, pcsysrootdir); | ||
| 20 | - g_string_append (str, tmpstr+2); | ||
| 21 | - } | ||
| 22 | + g_string_append_c (str, '-'); | ||
| 23 | + g_string_append_c (str, tmpstr[1]); | ||
| 24 | + g_string_append (str, pcsysrootdir); | ||
| 25 | + g_string_append (str, tmpstr+2); | ||
| 26 | } | ||
| 27 | - else | ||
| 28 | + else | ||
| 29 | { | ||
| 30 | g_string_append (str, tmpstr); | ||
| 31 | } | ||