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.

(From OE-Core rev: 382bd564d0675bded38459943ab1fe5dbc1e9ee7)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2012-05-25 07:59:02 +00:00
parent 37cf162998
commit 0254e8d7d9
2 changed files with 6 additions and 5 deletions

View File

@ -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"

View File

@ -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 \