Am Montag, den 18.04.2011, 15:47 +0200 schrieb Paul Menzel:
> Date: Sun, 17 Apr 2011 22:44:04 +0200
>
> In pkg-config releases after 0.23 no patches need to be applied and OE
> defaults can be used. Since `pkgconfig-{native,sdk}` also need the common
> bits factor those out into `pkgconfig-0.23.inc`.
>
> This patch is build tested using `angstrom-2010.x` and `minimal{,-uclibc}`
> for `MACHINE = "beagleboard"`.
>
> Signed-off-by: Paul Menzel <[email protected]>
> ---
> recipes/pkgconfig/pkgconfig-0.23.inc | 14 ++++++++++++++
> recipes/pkgconfig/pkgconfig-native_0.23.bb | 6 +-----
> recipes/pkgconfig/pkgconfig-sdk_0.23.bb | 6 +-----
> recipes/pkgconfig/pkgconfig.inc | 11 +++--------
> recipes/pkgconfig/pkgconfig_0.23.bb | 7 ++-----
> 5 files changed, 21 insertions(+), 23 deletions(-)
> create mode 100644 recipes/pkgconfig/pkgconfig-0.23.inc
>
> diff --git a/recipes/pkgconfig/pkgconfig-0.23.inc
> b/recipes/pkgconfig/pkgconfig-0.23.inc
> new file mode 100644
> index 0000000..5f87d28
> --- /dev/null
> +++ b/recipes/pkgconfig/pkgconfig-0.23.inc
> @@ -0,0 +1,14 @@
> +require pkgconfig.inc
> +
> +SRC_URI += " \
> + file://autofoo.patch \
> + file://sysrootfix.patch \
> + file://glibconfig-sysdefs.h \
> + "
> +SRC_URI[md5sum] = "d922a88782b64441d06547632fd85744"
> +SRC_URI[sha256sum] =
> "08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53"
> +
> +acpaths = "-I ."
> +do_configure_prepend () {
> + install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.*/
> +}
> diff --git a/recipes/pkgconfig/pkgconfig-native_0.23.bb
> b/recipes/pkgconfig/pkgconfig-native_0.23.bb
> index f5f44ac..309077a 100644
> --- a/recipes/pkgconfig/pkgconfig-native_0.23.bb
> +++ b/recipes/pkgconfig/pkgconfig-native_0.23.bb
> @@ -1,11 +1,7 @@
> -require pkgconfig.inc
> +require pkgconfig-0.23.inc
> FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
>
> PR = "${INC_PR}.1"
>
> -S = "${WORKDIR}/pkg-config-${PV}/"
> inherit native
> DEPENDS = ""
> -
> -SRC_URI[md5sum] = "d922a88782b64441d06547632fd85744"
> -SRC_URI[sha256sum] =
> "08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53"
> diff --git a/recipes/pkgconfig/pkgconfig-sdk_0.23.bb
> b/recipes/pkgconfig/pkgconfig-sdk_0.23.bb
> index cbe6b81..4efb7bd 100644
> --- a/recipes/pkgconfig/pkgconfig-sdk_0.23.bb
> +++ b/recipes/pkgconfig/pkgconfig-sdk_0.23.bb
> @@ -1,11 +1,7 @@
> -require pkgconfig.inc
> +require pkgconfig-0.23.inc
> FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
>
> PR = "${INC_PR}.1"
>
> -S = "${WORKDIR}/pkg-config-${PV}/"
> inherit sdk
> DEPENDS = ""
> -
> -SRC_URI[md5sum] = "d922a88782b64441d06547632fd85744"
> -SRC_URI[sha256sum] =
> "08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53"
> diff --git a/recipes/pkgconfig/pkgconfig.inc b/recipes/pkgconfig/pkgconfig.inc
> index 4edad6a..e6fa5f1 100644
> --- a/recipes/pkgconfig/pkgconfig.inc
> +++ b/recipes/pkgconfig/pkgconfig.inc
> @@ -5,22 +5,17 @@ It replaces the ubiquitous *-config scripts you may have \
> seen with a single tool."
> HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/";
> LICENSE = "GPLv2+"
> +DEPENDS = "glib-2.0"
> INC_PR = "r8"
>
> SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz
> \
> - file://autofoo.patch \
> - file://sysrootfix.patch \
> - file://glibconfig-sysdefs.h"
> + "
>
> +# Setting `S` is needed, since the recipe name is `pkgconfig` instead of
> `pkg-config`.
> S = "${WORKDIR}/pkg-config-${PV}/"
>
> inherit autotools
>
> -acpaths = "-I ."
> -do_configure_prepend () {
> - install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.*/
> -}
> -
> do_install_append() {
> install -d -m 0755 ${D}${libdir}/pkgconfig
> }
> diff --git a/recipes/pkgconfig/pkgconfig_0.23.bb
> b/recipes/pkgconfig/pkgconfig_0.23.bb
> index 39f7010..3d8fe6c 100644
> --- a/recipes/pkgconfig/pkgconfig_0.23.bb
> +++ b/recipes/pkgconfig/pkgconfig_0.23.bb
> @@ -1,9 +1,6 @@
> -require pkgconfig.inc
> +require ${PN}.inc
> +require ${P}.inc
>
> PR = "${INC_PR}.3"
>
> -DEPENDS += "glib-2.0"
> EXTRA_OECONF = "--with-installed-glib"
> -
> -SRC_URI[md5sum] = "d922a88782b64441d06547632fd85744"
> -SRC_URI[sha256sum] =
> "08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53"
> _______________________________________________
> Openembedded-devel mailing list
> [email protected]
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
signature.asc
Description: This is a digitally signed message part
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
