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:28:49 +0100 |
commit | 0254e8d7d94d4bfdd636f25407b4e3cb7a1f606b (patch) | |
tree | 6f51a9b52e9a2e297b3eb410c7676726113db101 /meta/recipes-core/glib-2.0/glib.inc | |
parent | 37cf162998b13d7d594c7ed68c47d440a3033ed5 (diff) | |
download | poky-0254e8d7d94d4bfdd636f25407b4e3cb7a1f606b.tar.gz |
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>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib.inc')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 8 |
1 files changed, 5 insertions, 3 deletions
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 | |||
25 | 25 | ||
26 | S = "${WORKDIR}/glib-${PV}" | 26 | S = "${WORKDIR}/glib-${PV}" |
27 | 27 | ||
28 | EXTRA_OECONF = "--disable-debug --enable-included-printf=no --disable-dtrace --disable-fam" | 28 | CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap" |
29 | EXTRA_OECONF_virtclass-native = "--disable-dtrace --disable-systemtap --disable-fam" | 29 | |
30 | EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no --disable-dtrace --disable-fam" | 30 | EXTRA_OECONF = "--disable-debug --enable-included-printf=no ${CORECONF}" |
31 | EXTRA_OECONF_virtclass-native = "${CORECONF}" | ||
32 | EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no ${CORECONF}" | ||
31 | 33 | ||
32 | FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas" | 34 | FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas" |
33 | FILES_${PN}-dev += "${libdir}/glib-2.0/include \ | 35 | FILES_${PN}-dev += "${libdir}/glib-2.0/include \ |