summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-27 12:16:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-27 12:17:27 +0000
commitf420fb3de1f588a51dd6009452c7836903fa9158 (patch)
tree33be51ad01c352eef6207a4bcb1ba7b4089c0366 /meta
parent6cf61b30aaaee43dd8ea8037d583db413250beb0 (diff)
downloadpoky-f420fb3de1f588a51dd6009452c7836903fa9158.tar.gz
glib-2.0: Disable fam, we don't depend on it
Various people are reporting glib-2.0 failures from a dependency on libfam creeping in uninvited. This patch explicitly disables it to favour a deterministic build. (From OE-Core rev: e1d5a81bf78786dcb11a4840436f46ba9ec4010e) 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.30.2.bb2
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc6
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb
index 0b26575fc0..0e96fc16b9 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb
@@ -1,6 +1,6 @@
1require glib.inc 1require glib.inc
2 2
3PR = "r6" 3PR = "r7"
4PE = "1" 4PE = "1"
5 5
6DEPENDS += "libffi python-argparse-native zlib" 6DEPENDS += "libffi python-argparse-native zlib"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 6eddf8f2a6..835743aa98 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -25,9 +25,9 @@ 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" 28EXTRA_OECONF = "--disable-debug --enable-included-printf=no --disable-dtrace --disable-fam"
29EXTRA_OECONF_virtclass-native = "--disable-dtrace --disable-systemtap" 29EXTRA_OECONF_virtclass-native = "--disable-dtrace --disable-systemtap --disable-fam"
30EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no --disable-dtrace" 30EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no --disable-dtrace --disable-fam"
31 31
32FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas" 32FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas"
33FILES_${PN}-dev += "${libdir}/glib-2.0/include \ 33FILES_${PN}-dev += "${libdir}/glib-2.0/include \