Skip to contentSkip to conversation

glib-2.0: Clean up OECONF flags into one variable

PATCH In review Richard Purdie 2 participants 2 messages May 25, 2012

lore
Share & tools
lore

Richard Purdie

author
#0 lore raw

PATCH 1/1 glib-2.0: Clean up OECONF flags into one variable

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 <[email protected]>

---

meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb +0 -2
index c453941..64441ee 100644
@@ -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"
meta/recipes-core/glib-2.0/glib.inc +5 -3
index 33f7613..1dbd538 100644
@@ -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 \
#1 lore raw
Quoted 28 lines · Richard Purdie

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 <[email protected]>

---

meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb +0 -2
index c453941..64441ee 100644
@@ -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"
meta/recipes-core/glib-2.0/glib.inc +0 -1
index 33f7613..1dbd538 100644
@@ -25,9 +25,11 @@ inherit autotools pkgconfig gettext
 
 S = "${WORKDIR}/glib-${PV}"
 
-EXTRA_OECONF = "--disable-debug --enable-included-printf=no --disable-dtrace --disable-fam"

meta/recipes-core/glib-2.0/glib.inc inherit autotools pkgconfig gettext · line 35

Quoted 10 lines
meta/recipes-core/glib-2.0/glib.inc +5 -2
-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,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]