[oe-commits] Richard Purdie : glib-2.0: Clean up OECONF flags into one variable

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 382bd564d0675bded38459943ab1fe5dbc1e9ee7
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=382bd564d0675bded38459943ab1fe5dbc1e9ee7

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Fri May 25 07:59:02 2012 +0000

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 <richard.purdie at linuxfoundation.org>

---

 meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb |    3 +--
 meta/recipes-core/glib-2.0/glib.inc           |    8 +++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

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..6f89f56 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
@@ -1,5 +1,6 @@
 require glib.inc
 
+PR = "r1"
 PE = "1"
 
 DEPENDS += "libffi python-argparse-native zlib"
@@ -21,8 +22,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 \