diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-04-14 23:00:52 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-04-14 23:00:52 +0000 |
| commit | 9bedb92e21cecfcc653078531f4389003abea82c (patch) | |
| tree | 02dd43b6d2cd74a27db77ab559f9ce9e22285dbe | |
| parent | 04f6ecb3e67c93379c229d35ace8bce00ceeb092 (diff) | |
| download | openembedded-core-9bedb92e21cecfcc653078531f4389003abea82c.tar.gz openembedded-core-9bedb92e21cecfcc653078531f4389003abea82c.tar.bz2 openembedded-core-9bedb92e21cecfcc653078531f4389003abea82c.zip | |
pkgconfig: Remove custom do_configure from pkgconfig-native, tweak autofoo.patch to fix some missing quotes apply autofoo.patch to all versions
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4262 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/pkgconfig/pkgconfig-0.23/autofoo.patch | 13 | ||||
| -rw-r--r-- | meta/packages/pkgconfig/pkgconfig-native_0.23.bb | 6 | ||||
| -rw-r--r-- | meta/packages/pkgconfig/pkgconfig.inc | 3 | ||||
| -rw-r--r-- | meta/packages/pkgconfig/pkgconfig_0.23.bb | 2 |
4 files changed, 15 insertions, 9 deletions
diff --git a/meta/packages/pkgconfig/pkgconfig-0.23/autofoo.patch b/meta/packages/pkgconfig/pkgconfig-0.23/autofoo.patch index 9a78f3bfd0..97895387f5 100644 --- a/meta/packages/pkgconfig/pkgconfig-0.23/autofoo.patch +++ b/meta/packages/pkgconfig/pkgconfig-0.23/autofoo.patch @@ -511,3 +511,16 @@ Index: pkg-config-0.23/glib-1.2.10/configure.in if cmp -s $outfile glibconfig.h; then +Index: pkg-config-0.23/glib-1.2.10/glib.m4 +=================================================================== +--- pkg-config-0.23.orig/glib-1.2.10/glib.m4 2008-04-14 23:34:39.000000000 +0100 ++++ pkg-config-0.23/glib-1.2.10/glib.m4 2008-04-14 09:26:29.000000000 +0100 +@@ -5,7 +5,7 @@ + dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or + dnl gthread is specified in MODULES, pass to glib-config + dnl +-AC_DEFUN(AM_PATH_GLIB, ++AC_DEFUN([AM_PATH_GLIB], + [dnl + dnl Get the cflags and libraries from the glib-config script + dnl diff --git a/meta/packages/pkgconfig/pkgconfig-native_0.23.bb b/meta/packages/pkgconfig/pkgconfig-native_0.23.bb index d167bd7699..24497a9866 100644 --- a/meta/packages/pkgconfig/pkgconfig-native_0.23.bb +++ b/meta/packages/pkgconfig/pkgconfig-native_0.23.bb @@ -4,9 +4,3 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}" S = "${WORKDIR}/pkg-config-${PV}/" inherit native DEPENDS = "" - -do_configure() { - gnu-configize - libtoolize --force - oe_runconf -} diff --git a/meta/packages/pkgconfig/pkgconfig.inc b/meta/packages/pkgconfig/pkgconfig.inc index 6fec0c3645..58c6f90f19 100644 --- a/meta/packages/pkgconfig/pkgconfig.inc +++ b/meta/packages/pkgconfig/pkgconfig.inc @@ -5,9 +5,10 @@ It replaces the ubiquitous *-config scripts you may have \ seen with a single tool." HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/" LICENSE = "GPL" -PR = "r6" +PR = "r7" SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \ + file://autofoo.patch;patch=1 \ file://sysrootfix.patch;patch=1 \ file://glibconfig-sysdefs.h" diff --git a/meta/packages/pkgconfig/pkgconfig_0.23.bb b/meta/packages/pkgconfig/pkgconfig_0.23.bb index 39fdc30f2c..10ce0fc9c3 100644 --- a/meta/packages/pkgconfig/pkgconfig_0.23.bb +++ b/meta/packages/pkgconfig/pkgconfig_0.23.bb @@ -1,6 +1,4 @@ require pkgconfig.inc -SRC_URI += "file://autofoo.patch;patch=1" - DEPENDS += "glib-2.0" EXTRA_OECONF = "--with-installed-glib" |