mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

pkgconfig: Fix problems with the sysroot implementation merged upstream, switch pkgconfig to link against an external glib-2.0

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4126 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2008-03-26 22:37:55 +00:00
parent c3735c4462
commit cd22fcc461
3 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/packages/pkgconfig/pkgconfig-0.23/sysrootfix.patch
Vendored
+31
View File
@@ -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);
}
meta/packages/pkgconfig/pkgconfig.inc
+2 -1
View File
@@ -5,9 +5,10 @@ It replaces the ubiquitous *-config scripts you may have \
seen with a single tool." seen with a single tool."
HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/" HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/"
LICENSE = "GPL" LICENSE = "GPL"
PR = "r3" PR = "r6"
SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \ SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
file://sysrootfix.patch;patch=1 \
file://glibconfig-sysdefs.h" file://glibconfig-sysdefs.h"
S = "${WORKDIR}/pkg-config-${PV}/" S = "${WORKDIR}/pkg-config-${PV}/"
meta/packages/pkgconfig/pkgconfig_0.23.bb
+3
View File
@@ -1,3 +1,6 @@
require pkgconfig.inc require pkgconfig.inc
SRC_URI += "file://autofoo.patch;patch=1" SRC_URI += "file://autofoo.patch;patch=1"
DEPENDS += "glib-2.0"
EXTRA_OECONF = "--with-installed-glib"