| Submitter | Richard Purdie |
|---|---|
| Date | May 25, 2012, 8:01 a.m. |
| Message ID | <1337932878.20169.5.camel@ted> |
| Download | mbox | patch |
| Permalink | /patch/28811/ |
| State | New |
| Headers | show |
Comments
On Fri, May 25, 2012 at 09:01:18AM +0100, Richard Purdie wrote: > Without this change, libelf was "floating" for linuxstdbase for example, > leading to build failures. This patch moves all the common options > into a common variable. > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > --- > diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb > index c453941..64441ee 100644 > --- a/meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb > +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb > @@ -21,8 +21,6 @@ SRC_URI[sha256sum] = "b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e403 > SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" > BBCLASSEXTEND = "native nativesdk" > > -EXTRA_OECONF = "--disable-libelf" > - > PERLPATH = "${bindir}/env perl" > PERLPATH_virtclass-native = "/usr/bin/env perl" > PERLPATH_virtclass-nativesdk = "/usr/bin/env perl" > diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc > index 33f7613..1dbd538 100644 > --- a/meta/recipes-core/glib-2.0/glib.inc > +++ b/meta/recipes-core/glib-2.0/glib.inc > @@ -25,9 +25,11 @@ inherit autotools pkgconfig gettext > > S = "${WORKDIR}/glib-${PV}" > > -EXTRA_OECONF = "--disable-debug --enable-included-printf=no --disable-dtrace --disable-fam" > -EXTRA_OECONF_virtclass-native = "--disable-dtrace --disable-systemtap --disable-fam" > -EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no --disable-dtrace --disable-fam" > +CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap" > + > +EXTRA_OECONF = "--disable-debug --enable-included-printf=no ${CORECONF}" > +EXTRA_OECONF_virtclass-native = "${CORECONF}" > +EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no ${CORECONF}" > > FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas" > FILES_${PN}-dev += "${libdir}/glib-2.0/include \ Ah sorry for that EXTRA_OECONF in .bb, looks much better, please add PR bump. Cheers,
Patch
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb index c453941..64441ee 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb @@ -21,8 +21,6 @@ SRC_URI[sha256sum] = "b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e403 SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" BBCLASSEXTEND = "native nativesdk" -EXTRA_OECONF = "--disable-libelf" - PERLPATH = "${bindir}/env perl" PERLPATH_virtclass-native = "/usr/bin/env perl" PERLPATH_virtclass-nativesdk = "/usr/bin/env perl" diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 33f7613..1dbd538 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -25,9 +25,11 @@ inherit autotools pkgconfig gettext S = "${WORKDIR}/glib-${PV}" -EXTRA_OECONF = "--disable-debug --enable-included-printf=no --disable-dtrace --disable-fam" -EXTRA_OECONF_virtclass-native = "--disable-dtrace --disable-systemtap --disable-fam" -EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no --disable-dtrace --disable-fam" +CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap" + +EXTRA_OECONF = "--disable-debug --enable-included-printf=no ${CORECONF}" +EXTRA_OECONF_virtclass-native = "${CORECONF}" +EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no ${CORECONF}" FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas" FILES_${PN}-dev += "${libdir}/glib-2.0/include \
Without this change, libelf was "floating" for linuxstdbase for example, leading to build failures. This patch moves all the common options into a common variable. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> ---