sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

pkgconfig: upgrade to version 0.25 

from 0.23

changes:
  - remove sysrootfix patch, it's now in upstream
  - use external popt instead of the included one

Signed-off-by: Qing He <qing.he@intel.com>
This commit is contained in:
Qing He 2010-07-13 15:04:13 +08:00 committed by Richard Purdie
parent 231f58590e
commit 46039a37ab
5 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
meta/packages/pkgconfig/pkgconfig-0.23/sysrootfix.patch vendored
View File

@ -1,31 +0,0 @@
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);
}

0
meta/packages/pkgconfig/pkgconfig-0.23/autofoo.patch → meta/packages/pkgconfig/pkgconfig-0.25/autofoo.patch vendored
View File

0
meta/packages/pkgconfig/pkgconfig-0.23/glibconfig-sysdefs.h → meta/packages/pkgconfig/pkgconfig-0.25/glibconfig-sysdefs.h vendored
View File

7
meta/packages/pkgconfig/pkgconfig.inc
View File

@ -7,15 +7,14 @@ BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=pkg-config"
SECTION = "console/utils"
LICENSE = "GPLv2+"
PR = "r8"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
DEPENDS = "glib-2.0"
DEPENDS = "glib-2.0 popt"
DEPENDS_virtclass-native = ""
DEPENDS_virtclass-nativesdk = ""
SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
file://autofoo.patch \
file://sysrootfix.patch \
file://glibconfig-sysdefs.h \
file://disable-legacy.patch"
@ -23,7 +22,7 @@ S = "${WORKDIR}/pkg-config-${PV}/"
inherit autotools
EXTRA_OECONF = "--with-installed-glib --disable-legacy-scripts"
EXTRA_OECONF = "--with-installed-glib --with-installed-popt --disable-legacy-scripts"
EXTRA_OECONF_virtclass-native = "--disable-legacy-scripts"
EXTRA_OECONF_virtclass-nativesdk = "--disable-legacy-scripts"

2
meta/packages/pkgconfig/pkgconfig_0.23.bb → meta/packages/pkgconfig/pkgconfig_0.25.bb
View File

@ -1 +1,3 @@
require pkgconfig.inc
PR = "r0"