diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-06-02 09:08:01 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-06-02 09:08:01 +0000 |
| commit | bad171746b87ee785e259c8163ebd14221b13a8f (patch) | |
| tree | 534b1222dbba8210e849bb2ae741adea8f7da73e | |
| parent | 63301a3e3ef8249810c54db7f1fb2ada99cd55bb (diff) | |
| parent | c61fc95d2deb7924357f73ef1cd4b42bba956376 (diff) | |
merge of '57b770a7023dbcdb2b9d6d1a19890a743793d79c'
and 'a6a18f676265371134e8944deb4be3fa0724a352'
| -rw-r--r-- | packages/pkgconfig/pkgconfig-0.22/sysrootfix.patch (renamed from packages/pkgconfig/pkgconfig-0.22/sysroot-support.patch) | 0 | ||||
| -rw-r--r-- | packages/pkgconfig/pkgconfig-native_0.23.bb | 8 | ||||
| -rw-r--r-- | packages/pkgconfig/pkgconfig-sdk_0.23.bb | 5 | ||||
| -rw-r--r-- | packages/pkgconfig/pkgconfig.inc | 5 | ||||
| -rw-r--r-- | packages/pkgconfig/pkgconfig_0.22.bb | 1 | ||||
| -rw-r--r-- | packages/pkgconfig/pkgconfig_0.23.bb | 6 |
6 files changed, 17 insertions, 8 deletions
diff --git a/packages/pkgconfig/pkgconfig-0.22/sysroot-support.patch b/packages/pkgconfig/pkgconfig-0.22/sysrootfix.patch index 2e4f796cc9..2e4f796cc9 100644 --- a/packages/pkgconfig/pkgconfig-0.22/sysroot-support.patch +++ b/packages/pkgconfig/pkgconfig-0.22/sysrootfix.patch diff --git a/packages/pkgconfig/pkgconfig-native_0.23.bb b/packages/pkgconfig/pkgconfig-native_0.23.bb new file mode 100644 index 0000000000..c4028ab43c --- /dev/null +++ b/packages/pkgconfig/pkgconfig-native_0.23.bb @@ -0,0 +1,8 @@ +require pkgconfig.inc +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}" + +DEFAULT_PREFERENCE = "-1" + +S = "${WORKDIR}/pkg-config-${PV}/" +inherit native +DEPENDS = "" diff --git a/packages/pkgconfig/pkgconfig-sdk_0.23.bb b/packages/pkgconfig/pkgconfig-sdk_0.23.bb index 8c40f04e10..3b20371777 100644 --- a/packages/pkgconfig/pkgconfig-sdk_0.23.bb +++ b/packages/pkgconfig/pkgconfig-sdk_0.23.bb @@ -1,11 +1,6 @@ require pkgconfig.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}" -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" - S = "${WORKDIR}/pkg-config-${PV}/" inherit sdk DEPENDS = "" diff --git a/packages/pkgconfig/pkgconfig.inc b/packages/pkgconfig/pkgconfig.inc index 77c9e1c5a5..939199bc37 100644 --- a/packages/pkgconfig/pkgconfig.inc +++ b/packages/pkgconfig/pkgconfig.inc @@ -5,10 +5,11 @@ It replaces the ubiquitous *-config scripts you may have \ seen with a single tool." HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/" LICENSE = "GPL" -PR = "r2" +PR = "r7" SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \ - file://sysroot-support.patch;patch=1 \ + file://autofoo.patch;patch=1 \ + file://sysrootfix.patch;patch=1 \ file://glibconfig-sysdefs.h" S = "${WORKDIR}/pkg-config-${PV}/" diff --git a/packages/pkgconfig/pkgconfig_0.22.bb b/packages/pkgconfig/pkgconfig_0.22.bb index 599e1c815e..a0f5241a12 100644 --- a/packages/pkgconfig/pkgconfig_0.22.bb +++ b/packages/pkgconfig/pkgconfig_0.22.bb @@ -1,3 +1,2 @@ require pkgconfig.inc -SRC_URI += "file://autofoo.patch;patch=1" diff --git a/packages/pkgconfig/pkgconfig_0.23.bb b/packages/pkgconfig/pkgconfig_0.23.bb new file mode 100644 index 0000000000..154e302844 --- /dev/null +++ b/packages/pkgconfig/pkgconfig_0.23.bb @@ -0,0 +1,6 @@ +require pkgconfig.inc + +DEFAULT_PREFERENCE = "-1" + +DEPENDS += "glib-2.0" +EXTRA_OECONF = "--with-installed-glib" |