summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-25 07:59:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-25 11:28:49 +0100
commit0254e8d7d94d4bfdd636f25407b4e3cb7a1f606b (patch)
tree6f51a9b52e9a2e297b3eb410c7676726113db101 /meta
parent37cf162998b13d7d594c7ed68c47d440a3033ed5 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb3
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc8
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 @@
1require glib.inc 1require glib.inc
2 2
3PR = "r1"
3PE = "1" 4PE = "1"
4 5
5DEPENDS += "libffi python-argparse-native zlib" 6DEPENDS += "libffi python-argparse-native zlib"
@@ -21,8 +22,6 @@ SRC_URI[sha256sum] = "b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e403
21SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" 22SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
22BBCLASSEXTEND = "native nativesdk" 23BBCLASSEXTEND = "native nativesdk"
23 24
24EXTRA_OECONF = "--disable-libelf"
25
26PERLPATH = "${bindir}/env perl" 25PERLPATH = "${bindir}/env perl"
27PERLPATH_virtclass-native = "/usr/bin/env perl" 26PERLPATH_virtclass-native = "/usr/bin/env perl"
28PERLPATH_virtclass-nativesdk = "/usr/bin/env perl" 27PERLPATH_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
25 25
26S = "${WORKDIR}/glib-${PV}" 26S = "${WORKDIR}/glib-${PV}"
27 27
28EXTRA_OECONF = "--disable-debug --enable-included-printf=no --disable-dtrace --disable-fam" 28CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap"
29EXTRA_OECONF_virtclass-native = "--disable-dtrace --disable-systemtap --disable-fam" 29
30EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no --disable-dtrace --disable-fam" 30EXTRA_OECONF = "--disable-debug --enable-included-printf=no ${CORECONF}"
31EXTRA_OECONF_virtclass-native = "${CORECONF}"
32EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no ${CORECONF}"
31 33
32FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas" 34FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas"
33FILES_${PN}-dev += "${libdir}/glib-2.0/include \ 35FILES_${PN}-dev += "${libdir}/glib-2.0/include \