summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2010-07-13 15:04:13 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-16 16:25:17 +0100
commit46039a37abf74b0757c7d81a3c25681f35b91a03 (patch)
tree7324e3140e72ddb825056dd810ed2af96b457174
parent231f58590e0b3dc5b8b7771e36e71c540fcd6341 (diff)
downloadpoky-46039a37abf74b0757c7d81a3c25681f35b91a03.tar.gz
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>
-rw-r--r--meta/packages/pkgconfig/pkgconfig-0.23/sysrootfix.patch31
-rw-r--r--meta/packages/pkgconfig/pkgconfig-0.25/autofoo.patch (renamed from meta/packages/pkgconfig/pkgconfig-0.23/autofoo.patch)0
-rw-r--r--meta/packages/pkgconfig/pkgconfig-0.25/glibconfig-sysdefs.h (renamed from meta/packages/pkgconfig/pkgconfig-0.23/glibconfig-sysdefs.h)0
-rw-r--r--meta/packages/pkgconfig/pkgconfig.inc7
-rw-r--r--meta/packages/pkgconfig/pkgconfig_0.25.bb (renamed from meta/packages/pkgconfig/pkgconfig_0.23.bb)2
5 files changed, 5 insertions, 35 deletions
diff --git a/meta/packages/pkgconfig/pkgconfig-0.23/sysrootfix.patch b/meta/packages/pkgconfig/pkgconfig-0.23/sysrootfix.patch
deleted file mode 100644
index c5ee82e9aa..0000000000
--- a/meta/packages/pkgconfig/pkgconfig-0.23/sysrootfix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Index: 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 }
diff --git a/meta/packages/pkgconfig/pkgconfig-0.23/autofoo.patch b/meta/packages/pkgconfig/pkgconfig-0.25/autofoo.patch
index 97895387f5..97895387f5 100644
--- a/meta/packages/pkgconfig/pkgconfig-0.23/autofoo.patch
+++ b/meta/packages/pkgconfig/pkgconfig-0.25/autofoo.patch
diff --git a/meta/packages/pkgconfig/pkgconfig-0.23/glibconfig-sysdefs.h b/meta/packages/pkgconfig/pkgconfig-0.25/glibconfig-sysdefs.h
index 1329e7f21c..1329e7f21c 100644
--- a/meta/packages/pkgconfig/pkgconfig-0.23/glibconfig-sysdefs.h
+++ b/meta/packages/pkgconfig/pkgconfig-0.25/glibconfig-sysdefs.h
diff --git a/meta/packages/pkgconfig/pkgconfig.inc b/meta/packages/pkgconfig/pkgconfig.inc
index a42ee9e1d0..c0e748173d 100644
--- a/meta/packages/pkgconfig/pkgconfig.inc
+++ b/meta/packages/pkgconfig/pkgconfig.inc
@@ -7,15 +7,14 @@ BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=pkg-config"
7SECTION = "console/utils" 7SECTION = "console/utils"
8 8
9LICENSE = "GPLv2+" 9LICENSE = "GPLv2+"
10PR = "r8" 10LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
11 11
12DEPENDS = "glib-2.0" 12DEPENDS = "glib-2.0 popt"
13DEPENDS_virtclass-native = "" 13DEPENDS_virtclass-native = ""
14DEPENDS_virtclass-nativesdk = "" 14DEPENDS_virtclass-nativesdk = ""
15 15
16SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \ 16SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
17 file://autofoo.patch \ 17 file://autofoo.patch \
18 file://sysrootfix.patch \
19 file://glibconfig-sysdefs.h \ 18 file://glibconfig-sysdefs.h \
20 file://disable-legacy.patch" 19 file://disable-legacy.patch"
21 20
@@ -23,7 +22,7 @@ S = "${WORKDIR}/pkg-config-${PV}/"
23 22
24inherit autotools 23inherit autotools
25 24
26EXTRA_OECONF = "--with-installed-glib --disable-legacy-scripts" 25EXTRA_OECONF = "--with-installed-glib --with-installed-popt --disable-legacy-scripts"
27EXTRA_OECONF_virtclass-native = "--disable-legacy-scripts" 26EXTRA_OECONF_virtclass-native = "--disable-legacy-scripts"
28EXTRA_OECONF_virtclass-nativesdk = "--disable-legacy-scripts" 27EXTRA_OECONF_virtclass-nativesdk = "--disable-legacy-scripts"
29 28
diff --git a/meta/packages/pkgconfig/pkgconfig_0.23.bb b/meta/packages/pkgconfig/pkgconfig_0.25.bb
index d9ff6ea06c..09b28a5bd5 100644
--- a/meta/packages/pkgconfig/pkgconfig_0.23.bb
+++ b/meta/packages/pkgconfig/pkgconfig_0.25.bb
@@ -1 +1,3 @@
1require pkgconfig.inc 1require pkgconfig.inc
2
3PR = "r0"