diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-25 07:59:02 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-25 11:27:35 +0100 |
| commit | 382bd564d0675bded38459943ab1fe5dbc1e9ee7 (patch) | |
| tree | f8c87843e0e434765d7e43f6eb5c79026702c003 | |
| parent | fe6cabfb0c6f382ef6131e07437b90c2afbf5488 (diff) | |
| download | openembedded-core-382bd564d0675bded38459943ab1fe5dbc1e9ee7.tar.gz openembedded-core-382bd564d0675bded38459943ab1fe5dbc1e9ee7.tar.bz2 openembedded-core-382bd564d0675bded38459943ab1fe5dbc1e9ee7.zip | |
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@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb | 3 | ||||
| -rw-r--r-- | 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 c453941f4d..6f89f56ef8 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 33f76131b9..1dbd538fab 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 \ |