pkgconfig: Update to 0.28

PATCH New Saul Wold 1 participant 1 message May 13, 2013

Share & tools

Saul Wold

author

2013-05-13 07:25 UTC #0 lore raw

PATCH 1/1 pkgconfig: Update to 0.28

Remove older patches that have been fixed upstream, added new patch to use the correct alias-libtool instead of ./libtool.

pkgconfig provides an internal glib library, so use it to avoid ciruclar dependecny issues.

Signed-off-by Saul Wold <[email protected]>

---
 .../pkgconfig-0.25/obsolete_automake_macros.patch  | 35 ----------------
 .../autofoo.patch                                  |  0
 .../fix-glib-configure-libtool-usage.patch         | 45 ++++++++++++++++++++
 .../glibconfig-sysdefs.h                           |  0
 meta/recipes-devtools/pkgconfig/pkgconfig.inc      |  6 +--
 .../pkgconfig/pkgconfig/disable-legacy.patch       | 48 ----------------------
 meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb  | 13 ------
 meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb  | 10 +++++
 8 files changed, 58 insertions(+), 99 deletions(-)
 delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch
 rename meta/recipes-devtools/pkgconfig/{pkgconfig-0.25 => pkgconfig-0.28}/autofoo.patch (100%)
 create mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig-0.28/fix-glib-configure-libtool-usage.patch
 rename meta/recipes-devtools/pkgconfig/{pkgconfig-0.25 => pkgconfig-0.28}/glibconfig-sysdefs.h (100%)
 delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch
 delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
 create mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb

meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch deleted +0 ~~-35~~

deleted file mode 100644
index b6e7f62..0000000
@@ -1,35 +0,0 @@
-Upstream-Status: Backport [fixed in 0.27]
-
-Signed-off-by: Marko Lindqvist <[email protected]>
-diff -Nurd pkg-config-0.25/configure.in pkg-config-0.25/configure.in
---- pkg-config-0.25/configure.in	2010-05-28 18:55:09.000000000 +0300
-+++ pkg-config-0.25/configure.in	2013-01-01 22:13:47.009573426 +0200
-@@ -4,7 +4,7 @@
- AM_INIT_AUTOMAKE(pkg-config, 0.25)
- AM_MAINTAINER_MODE
-
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- AM_PROG_LIBTOOL
-
-diff -Nurd pkg-config-0.25/glib-1.2.10/configure.in pkg-config-0.25/glib-1.2.10/configure.in
---- pkg-config-0.25/glib-1.2.10/configure.in	2009-12-06 22:43:59.000000000 +0200
-+++ pkg-config-0.25/glib-1.2.10/configure.in	2013-01-01 22:23:36.701560486 +0200
-@@ -63,7 +63,7 @@
- AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
-
- # Specify a configuration file
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- AC_DEFINE_UNQUOTED(GLIB_MAJOR_VERSION, $GLIB_MAJOR_VERSION)
- AC_DEFINE_UNQUOTED(GLIB_MINOR_VERSION, $GLIB_MINOR_VERSION)
-@@ -154,7 +154,6 @@
-
- # Checks for programs.
- AC_PROG_CC
--AM_PROG_CC_STDC
- AC_PROG_INSTALL
-
- changequote(,)dnl

meta/recipes-devtools/pkgconfig/pkgconfig-0.28/autofoo.patch renamed from meta/recipes-devtools/pkgconfig/pkgconfig-0.25/autofoo.patch +0 -0

similarity index 100%
rename from meta/recipes-devtools/pkgconfig/pkgconfig-0.25/autofoo.patch
rename to meta/recipes-devtools/pkgconfig/pkgconfig-0.28/autofoo.patch

meta/recipes-devtools/pkgconfig/pkgconfig-0.28/fix-glib-configure-libtool-usage.patch new file +45 -0

45 lines not on this page · raw message

meta/recipes-devtools/pkgconfig/pkgconfig-0.28/glibconfig-sysdefs.h renamed from meta/recipes-devtools/pkgconfig/pkgconfig-0.25/glibconfig-sysdefs.h +0 -0

similarity index 100%
rename from meta/recipes-devtools/pkgconfig/pkgconfig-0.25/glibconfig-sysdefs.h
rename to meta/recipes-devtools/pkgconfig/pkgconfig-0.28/glibconfig-sysdefs.h

meta/recipes-devtools/pkgconfig/pkgconfig.inc +3 -3

index 52b9ad1..3e655a9 100644
@@ -18,9 +18,9 @@ S = "${WORKDIR}/pkg-config-${PV}/"
 
 inherit autotools
 
-EXTRA_OECONF = "--with-installed-glib --with-installed-popt --disable-legacy-scripts"
-EXTRA_OECONF_class-native = "--disable-legacy-scripts"
-EXTRA_OECONF_class-nativesdk = "--disable-legacy-scripts"
+EXTRA_OECONF = "--with-installed-glib --with-installed-popt --disable-legacy-scripts --with-internal-glib"
+EXTRA_OECONF_class-native = "--disable-legacy-scripts --with-internal-glib"
+EXTRA_OECONF_class-nativesdk = "--disable-legacy-scripts --with-internal-glib"
 
 acpaths = "-I ."
 do_configure_prepend () {

meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch deleted +0 ~~-48~~

48 lines not on this page · raw message

meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb deleted +0 ~~-13~~

deleted file mode 100644
index a55d017..0000000
@@ -1,13 +0,0 @@
-require pkgconfig.inc
-
-PR = "r7"
-
-SRC_URI += "file://autofoo.patch \
-            file://glibconfig-sysdefs.h \
-            file://pkg-config-native.in \
-            file://disable-legacy.patch \
-            file://obsolete_automake_macros.patch \
-           "
-
-SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745"
-SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e"

meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb new file +10 -0

new file mode 100644
index 0000000..99bb47f
@@ -0,0 +1,10 @@
+require pkgconfig.inc
+
+SRC_URI += " \
+            file://glibconfig-sysdefs.h \
+            file://pkg-config-native.in \
+            file://fix-glib-configure-libtool-usage.patch \
+           "
+
+SRC_URI[md5sum] = "aa3c86e67551adc3ac865160e34a2a0d"
+SRC_URI[sha256sum] = "6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845"

Signature · 1 line

1.8.0.2