[PATCH] glib-1.2: merged native and non-native recipes

[PATCH] glib-1.2: merged native and non-native recipes

[Fahad Usman]

* removed the glib-1.2-native_1.2.10.bb file
* added NATIVE_INSTALL_WORKS = "1"
* added BBCLASSEXTEND = "native"
* converted do_stage of native recipe to do_install_virtclass-native in the combined recipe
* added DEPENDS_virtclass-native = "" to avoid dependencies loops
* added gettext in inherit because it was needed by the native recipes
* bumped PR

Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
---
 recipes/glib-1.2/glib-1.2-native_1.2.10.bb |   49 ----------------------------
 recipes/glib-1.2/glib-1.2_1.2.10.bb        |   20 ++++++++++-
 2 files changed, 18 insertions(+), 51 deletions(-)

diff --git a/recipes/glib-1.2/glib-1.2-native_1.2.10.bb b/recipes/glib-1.2/glib-1.2-native_1.2.10.bb
deleted file mode 100644
index d00e9a1..0000000
--- a/recipes/glib-1.2/glib-1.2-native_1.2.10.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-PR = "r0"
-LICENSE = "LGPL"
-DESCRIPTION = "GLib 1.2 is a deprecated libray to \
-provide support for old glib 1.2 based applications"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = ""
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glib-1.2-${PV}"
-
-EXTRA_OECONF = "--disable-debug"
-
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/glib-${PV}.tar.gz \
-           file://glibconfig-sysdefs.h \
-           file://depcomp \
-           file://glib-reconf-fix;apply=yes \
-           file://posix-conf-changes;apply=yes \
-           file://gcc-3.4-pretty_function;apply=yes"
-
-
-S = "${WORKDIR}/glib-${PV}"
-
-inherit autotools pkgconfig native gettext
-
-acpaths = ""
-do_configure_prepend () {
-	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
-	install -m 0644 ${WORKDIR}/depcomp .
-	rm -f ltconfig acinclude.m4 libtool ltmain.sh
-}
-
-
-do_stage () {
-	oe_libinstall -so libglib ${STAGING_LIBDIR}
-	oe_libinstall -so -C gmodule libgmodule ${STAGING_LIBDIR}
-	oe_libinstall -so -C gthread libgthread ${STAGING_LIBDIR}
-	autotools_stage_includes
-	install -d ${STAGING_INCDIR}/glib-1.2
-	install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-1.2/glibconfig.h
-	install -d ${STAGING_DATADIR}/aclocal
-	install -m 0644 ${S}/glib.m4 ${STAGING_DATADIR}/aclocal/glib-1.2.m4
-}
-
-do_install () {
-	:
-}
-
-SRC_URI[md5sum] = "6fe30dad87c77b91b632def29dd69ef9"
-SRC_URI[sha256sum] = "6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f"
diff --git a/recipes/glib-1.2/glib-1.2_1.2.10.bb b/recipes/glib-1.2/glib-1.2_1.2.10.bb
index 72ee826..67266d4 100644
--- a/recipes/glib-1.2/glib-1.2_1.2.10.bb
+++ b/recipes/glib-1.2/glib-1.2_1.2.10.bb
@@ -4,7 +4,8 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "glib-1.2-native"
-PR = "r4"
+DEPENDS_virtclass-native = ""
+PR = "r5"
 
 LEAD_SONAME = "libglib-1.2.*"
 
@@ -22,7 +23,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/glib-${PV}.tar.gz \
 
 S = "${WORKDIR}/glib-${PV}"
 
-inherit autotools pkgconfig binconfig
+inherit autotools pkgconfig binconfig gettext
 
 acpaths = ""
 do_configure_prepend () {
@@ -31,6 +32,17 @@ do_configure_prepend () {
 	rm -f ltconfig acinclude.m4 libtool ltmain.sh
 }
 
+do_install_virtclass-native () {
+        oe_libinstall -so libglib ${D}${libdir}
+        oe_libinstall -so -C gmodule libgmodule ${D}${libdir}
+        oe_libinstall -so -C gthread libgthread ${D}${libdir}
+        autotools_do_install
+        install -d ${D}${includedir}/glib-1.2
+        install -m 0644 glibconfig.h glib.h ${D}${includedir}/glib-1.2/
+        install -d ${D}${datadir}/aclocal
+        install -m 0644 ${S}/glib.m4 ${D}${datadir}/aclocal/glib-1.2.m4
+}
+
 do_install_append () {
 	install -d ${D}${includedir}/glib-1.2
 	install -m 0644 glibconfig.h glib.h ${D}${includedir}/glib-1.2/
@@ -42,3 +54,7 @@ FILES_${PN}-dev += "${libdir}/glib/include/glibconfig.h"
 
 SRC_URI[md5sum] = "6fe30dad87c77b91b632def29dd69ef9"
 SRC_URI[sha256sum] = "6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f"
+
+BBCLASSEXTEND = "native"
+
+NATIVE_INSTALL_WORKS = "1"
-- 
1.6.3.3

Re: [PATCH] glib-1.2: merged native and non-native recipes

[Vitus Jensen]

Hello Fahad,

On Wed, 8 Sep 2010, Fahad Usman wrote:

> * removed the glib-1.2-native_1.2.10.bb file
> * added NATIVE_INSTALL_WORKS = "1"
> * added BBCLASSEXTEND = "native"
> * converted do_stage of native recipe to do_install_virtclass-native in the combined recipe
> * added DEPENDS_virtclass-native = "" to avoid dependencies loops
> * added gettext in inherit because it was needed by the native recipes
> * bumped PR
>
> Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
> ---
> recipes/glib-1.2/glib-1.2-native_1.2.10.bb |   49 ----------------------------
> recipes/glib-1.2/glib-1.2_1.2.10.bb        |   20 ++++++++++-
> 2 files changed, 18 insertions(+), 51 deletions(-)


> diff --git a/recipes/glib-1.2/glib-1.2_1.2.10.bb b/recipes/glib-1.2/glib-1.2_1.2.10.bb
> index 72ee826..67266d4 100644
> --- a/recipes/glib-1.2/glib-1.2_1.2.10.bb
> +++ b/recipes/glib-1.2/glib-1.2_1.2.10.bb
> @@ -4,7 +4,8 @@ SECTION = "libs"
> PRIORITY = "optional"
> LICENSE = "LGPL"
> DEPENDS = "glib-1.2-native"
> -PR = "r4"
> +DEPENDS_virtclass-native = ""
> +PR = "r5"

I don't know if everyone thinks so but I feel the following line is more 
elegant:

DEPENDS_pn-glib-1.2 += "glib-1.2-native"

You skip the DEPENDS_virtclass-native line and may use the "+=" operator.

Best regards,
    Vitus

PS: taken from my htmldoc recipe in patchwork

-- 
Vitus Jensen, Hannover, Germany, Universe (current)
pgp public key available from keyservers

[REGRESSION] [PATCH] glib-1.2: merged native and non-native recipes

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 2408 bytes --]

Dear Fahad, dear Tom,


Am Donnerstag, den 09.09.2010, 11:31 +0200 schrieb Vitus Jensen:

> On Wed, 8 Sep 2010, Fahad Usman wrote:
> 
> > * removed the glib-1.2-native_1.2.10.bb file
> > * added NATIVE_INSTALL_WORKS = "1"
> > * added BBCLASSEXTEND = "native"
> > * converted do_stage of native recipe to do_install_virtclass-native in the combined recipe
> > * added DEPENDS_virtclass-native = "" to avoid dependencies loops
> > * added gettext in inherit because it was needed by the native recipes
> > * bumped PR
> >
> > Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
> > ---
> > recipes/glib-1.2/glib-1.2-native_1.2.10.bb |   49 ----------------------------
> > recipes/glib-1.2/glib-1.2_1.2.10.bb        |   20 ++++++++++-
> > 2 files changed, 18 insertions(+), 51 deletions(-)
> 
> 
> > diff --git a/recipes/glib-1.2/glib-1.2_1.2.10.bb b/recipes/glib-1.2/glib-1.2_1.2.10.bb
> > index 72ee826..67266d4 100644
> > --- a/recipes/glib-1.2/glib-1.2_1.2.10.bb
> > +++ b/recipes/glib-1.2/glib-1.2_1.2.10.bb
> > @@ -4,7 +4,8 @@ SECTION = "libs"
> > PRIORITY = "optional"
> > LICENSE = "LGPL"
> > DEPENDS = "glib-1.2-native"
> > -PR = "r4"
> > +DEPENDS_virtclass-native = ""
> > +PR = "r5"
> 
> I don't know if everyone thinks so but I feel the following line is more 
> elegant:
> 
> DEPENDS_pn-glib-1.2 += "glib-1.2-native"
> 
> You skip the DEPENDS_virtclass-native line and may use the "+=" operator.

[…]

Tom committed an updated patch in 44af05 [1]. Unfortunately building the
recipe fails for me in `do_configure()`.

        […]
        | checking for arm-oe-linux-gnueabi-gcc... arm-oe-linux-gnueabi-gcc -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mthumb-interwork -mno-thumb
        | checking whether the C compiler works... no
        | configure: error: in `/oe/build-minimal-eglibc/minimal-dev/work/armv7a-oe-linux-gnueabi/glib-1.2-1.2.10-r5/glib-1.2.10':
        | configure: error: C compiler cannot create executables
        | See `config.log' for more details.
        | ERROR: Function do_configure failed
        NOTE: package glib-1.2-1.2.10-r5: task do_configure: Failed
        […]

Do you know what might cause this? Reverting this commit the recipe can
be build.


Thanks,

Paul


[1] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=44af05077f455f5b76cf76eb41dcc62a51de7582

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [REGRESSION] [PATCH] glib-1.2: merged native and non-native recipes

[Tom Rini]

Paul Menzel wrote:
> Dear Fahad, dear Tom,
> 
> 
> Am Donnerstag, den 09.09.2010, 11:31 +0200 schrieb Vitus Jensen:
> 
>> On Wed, 8 Sep 2010, Fahad Usman wrote:
>>
>>> * removed the glib-1.2-native_1.2.10.bb file
>>> * added NATIVE_INSTALL_WORKS = "1"
>>> * added BBCLASSEXTEND = "native"
>>> * converted do_stage of native recipe to do_install_virtclass-native in the combined recipe
>>> * added DEPENDS_virtclass-native = "" to avoid dependencies loops
>>> * added gettext in inherit because it was needed by the native recipes
>>> * bumped PR
>>>
>>> Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
>>> ---
>>> recipes/glib-1.2/glib-1.2-native_1.2.10.bb |   49 ----------------------------
>>> recipes/glib-1.2/glib-1.2_1.2.10.bb        |   20 ++++++++++-
>>> 2 files changed, 18 insertions(+), 51 deletions(-)
>>
>>> diff --git a/recipes/glib-1.2/glib-1.2_1.2.10.bb b/recipes/glib-1.2/glib-1.2_1.2.10.bb
>>> index 72ee826..67266d4 100644
>>> --- a/recipes/glib-1.2/glib-1.2_1.2.10.bb
>>> +++ b/recipes/glib-1.2/glib-1.2_1.2.10.bb
>>> @@ -4,7 +4,8 @@ SECTION = "libs"
>>> PRIORITY = "optional"
>>> LICENSE = "LGPL"
>>> DEPENDS = "glib-1.2-native"
>>> -PR = "r4"
>>> +DEPENDS_virtclass-native = ""
>>> +PR = "r5"
>> I don't know if everyone thinks so but I feel the following line is more 
>> elegant:
>>
>> DEPENDS_pn-glib-1.2 += "glib-1.2-native"
>>
>> You skip the DEPENDS_virtclass-native line and may use the "+=" operator.
> 
> […]
> 
> Tom committed an updated patch in 44af05 [1]. Unfortunately building the
> recipe fails for me in `do_configure()`.
> 
>         […]
>         | checking for arm-oe-linux-gnueabi-gcc... arm-oe-linux-gnueabi-gcc -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mthumb-interwork -mno-thumb
>         | checking whether the C compiler works... no
>         | configure: error: in `/oe/build-minimal-eglibc/minimal-dev/work/armv7a-oe-linux-gnueabi/glib-1.2-1.2.10-r5/glib-1.2.10':
>         | configure: error: C compiler cannot create executables
>         | See `config.log' for more details.
>         | ERROR: Function do_configure failed
>         NOTE: package glib-1.2-1.2.10-r5: task do_configure: Failed
>         […]
> 
> Do you know what might cause this? Reverting this commit the recipe can
> be build.

I just built it for angstrom-2008.1 / beagleboard (target and native). 
I've kicked off a minimal/eglibc/beagleboard build now.

-- 
Tom Rini
Mentor Graphics Corporation

Re: [REGRESSION] [PATCH] glib-1.2: merged native and non-native recipes

[Tom Rini]

Tom Rini wrote:
> Paul Menzel wrote:
>> Dear Fahad, dear Tom,
>>
>>
>> Am Donnerstag, den 09.09.2010, 11:31 +0200 schrieb Vitus Jensen:
>>
>>> On Wed, 8 Sep 2010, Fahad Usman wrote:
>>>
>>>> * removed the glib-1.2-native_1.2.10.bb file
>>>> * added NATIVE_INSTALL_WORKS = "1"
>>>> * added BBCLASSEXTEND = "native"
>>>> * converted do_stage of native recipe to do_install_virtclass-native 
>>>> in the combined recipe
>>>> * added DEPENDS_virtclass-native = "" to avoid dependencies loops
>>>> * added gettext in inherit because it was needed by the native recipes
>>>> * bumped PR
>>>>
>>>> Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
>>>> ---
>>>> recipes/glib-1.2/glib-1.2-native_1.2.10.bb |   49 
>>>> ----------------------------
>>>> recipes/glib-1.2/glib-1.2_1.2.10.bb        |   20 ++++++++++-
>>>> 2 files changed, 18 insertions(+), 51 deletions(-)
>>>
>>>> diff --git a/recipes/glib-1.2/glib-1.2_1.2.10.bb 
>>>> b/recipes/glib-1.2/glib-1.2_1.2.10.bb
>>>> index 72ee826..67266d4 100644
>>>> --- a/recipes/glib-1.2/glib-1.2_1.2.10.bb
>>>> +++ b/recipes/glib-1.2/glib-1.2_1.2.10.bb
>>>> @@ -4,7 +4,8 @@ SECTION = "libs"
>>>> PRIORITY = "optional"
>>>> LICENSE = "LGPL"
>>>> DEPENDS = "glib-1.2-native"
>>>> -PR = "r4"
>>>> +DEPENDS_virtclass-native = ""
>>>> +PR = "r5"
>>> I don't know if everyone thinks so but I feel the following line is 
>>> more elegant:
>>>
>>> DEPENDS_pn-glib-1.2 += "glib-1.2-native"
>>>
>>> You skip the DEPENDS_virtclass-native line and may use the "+=" 
>>> operator.
>>
>> […]
>>
>> Tom committed an updated patch in 44af05 [1]. Unfortunately building the
>> recipe fails for me in `do_configure()`.
>>
>>         […]
>>         | checking for arm-oe-linux-gnueabi-gcc... 
>> arm-oe-linux-gnueabi-gcc -march=armv7-a -mtune=cortex-a8 -mfpu=neon 
>> -mfloat-abi=softfp -mthumb-interwork -mno-thumb
>>         | checking whether the C compiler works... no
>>         | configure: error: in 
>> `/oe/build-minimal-eglibc/minimal-dev/work/armv7a-oe-linux-gnueabi/glib-1.2-1.2.10-r5/glib-1.2.10': 
>>
>>         | configure: error: C compiler cannot create executables
>>         | See `config.log' for more details.
>>         | ERROR: Function do_configure failed
>>         NOTE: package glib-1.2-1.2.10-r5: task do_configure: Failed
>>         […]
>>
>> Do you know what might cause this? Reverting this commit the recipe can
>> be build.
> 
> I just built it for angstrom-2008.1 / beagleboard (target and native). 
> I've kicked off a minimal/eglibc/beagleboard build now.

So, a funny thing happened somewhere:

$ (source bitbake.rc ; DISTRO=minimal LIBC=eglibc MACHINE=beagleboard 
bitbake glib-1.2 -e ) | grep ^DEPENDS
DEPENDS_virtclass-nativesdk="autoconf-native automake-native 
libtool-native libtool-cross gnu-config-native coreutils-native 
virtual/arm-oe-linux-gnueabi-gcc virtual/libc"
DEPENDS_virtclass-native="autoconf-native automake-native libtool-native 
libtool-cross gnu-config-native coreutils-native 
virtual/arm-oe-linux-gnueabi-gcc virtual/libc"
DEPENDS="glib-1.2-native"
DEPENDS_GETTEXT="gettext gettext-native virtual/libiconv virtual/libintl"
DEPENDS_pn-glib-1.2="glib-1.2-native"

I believe, from Chris hammering this into my head a few times 
previously, the way that the pn-foo override is applied, the entire 
contents of VAR_pn-foo will replace VAR.  IOW, DEPENDS_pn-glib-1.2 += 
"..." will append to DEPENDS_pn-glib-1.2 and then overwrite DEPENDS.

I'll to and fix everything a git grep shows shortly.

-- 
Tom Rini
Mentor Graphics Corporation