diff options
| -rw-r--r-- | meta/packages/pkgconfig/pkgconfig-0.23/sysrootfix.patch | 31 | ||||
| -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.inc | 7 | ||||
| -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 @@ -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); - } 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" 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" 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 @@ require pkgconfig.inc + +PR = "r0" |