[oe] [meta-oe++/master 03/11] glibmm: merge glibmm.inc into recipe - and stylize a bit

[Khem Raj]

Why merge inc ? Generally its helpful in writing recipes in other layers we
can share common code

On Sunday, May 19, 2013, Andreas Müller <schnitzeltony at googlemail.com>
wrote:
> Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
> ---
>  meta-oe/recipes-core/glib-2.0/glibmm.inc       |   28
-----------------------
>  meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb |   29
+++++++++++++++++++++--
>  2 files changed, 26 insertions(+), 31 deletions(-)
>  delete mode 100644 meta-oe/recipes-core/glib-2.0/glibmm.inc
>
> diff --git a/meta-oe/recipes-core/glib-2.0/glibmm.inc
b/meta-oe/recipes-core/glib-2.0/glibmm.inc
> deleted file mode 100644
> index bdb6ff8..0000000
> --- a/meta-oe/recipes-core/glib-2.0/glibmm.inc
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -DESCRIPTION = "C++ bindings for the glib library."
> -HOMEPAGE = "http://www.gtkmm.org/"
> -SECTION = "libs"
> -
> -LICENSE = "LGPLv2.1 & GPLv2"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
> -
 file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe"
> -
> -DEPENDS = "mm-common glib-2.0 libsigc++-2.0"
> -SHRT_VER =
"${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
> -
> -SRC_URI = "
ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.bz2;name=archive
"
> -
> -inherit autotools pkgconfig
> -
> -do_install_append() {
> -    install -d ${D}${datadir}/glibmm-2.4
> -    install -d ${D}${datadir}/aclocal
> -
> -    install -m 0644 glib/glibmmconfig.h ${D}${datadir}/glibmm-2.4/
> -    install -m 0644 scripts/glibmm_check_perl.m4 ${D}${datadir}/aclocal/
|| true
> -}
> -
> -FILES_${PN} = "${libdir}/lib*.so.*"
> -FILES_${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/
${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/"
> -
> -LIBV = "2.4.0"
> -
> diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bbb/meta-oe/recipes-core/glib-2.0/
glibmm_2.28.2.bb
> index c864153..0bdaa80 100644
> --- a/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb
> +++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb
> @@ -1,9 +1,32 @@
> -require glibmm.inc
> +DESCRIPTION = "C++ bindings for the glib library."
> +HOMEPAGE = "http://www.gtkmm.org/"
> +SECTION = "libs"
> +LICENSE = "LGPLv2.1 & GPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
> +
 file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe"
> +
> +DEPENDS = "mm-common glib-2.0 libsigc++-2.0"
> +inherit autotools pkgconfig
>
>  PR = "r3"
>
> +SHRT_VER =
"${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
> +
> +SRC_URI = " \
> +
ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.bz2\
> +    file://remove-examples.patch \
> +    file://glib-2.32.patch \
> +"
>  SRC_URI[archive.md5sum] = "cf33d1861d09fb2952a6a1d69e0502e3"
>  SRC_URI[archive.sha256sum] =
"7b67178363f8494c94f8b3dd704a4c8db7ad75a253fc84a4ad229e5e179ec192"
>
> -SRC_URI += " file://remove-examples.patch \
> -             file://glib-2.32.patch"
> +do_install_append() {
> +    install -d ${D}${datadir}/glibmm-2.4
> +    install -d ${D}${datadir}/aclocal
> +
> +    install -m 0644 glib/glibmmconfig.h ${D}${datadir}/glibmm-2.4/
> +    install -m 0644 scripts/glibmm_check_perl.m4 ${D}${datadir}/aclocal/
|| true
> +}
> +
> +FILES_${PN} = "${libdir}/lib*.so.*"
> +FILES_${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/
${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/"
> --
> 1.7.4.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>