summaryrefslogtreecommitdiff
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:16:35 +0000
commite1d5a81bf78786dcb11a4840436f46ba9ec4010e (patch)
tree28ab48c27b548cff7e753786cb7e2dd7e8457705
parent6e1065a4988489baa762f7dc1535fe326e0ba7b5 (diff)
downloadopenembedded-core-e1d5a81bf78786dcb11a4840436f46ba9ec4010e.tar.gz
openembedded-core-e1d5a81bf78786dcb11a4840436f46ba9ec4010e.tar.bz2
openembedded-core-e1d5a81bf78786dcb11a4840436f46ba9ec4010e.tar.xz
openembedded-core-e1d5a81bf78786dcb11a4840436f46ba9ec4010e.zip
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 0b26575fc..0e96fc16b 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 @@
require glib.inc
-PR = "r6"
+PR = "r7"
PE = "1"
DEPENDS += "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 6eddf8f2a..835743aa9 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
S = "${WORKDIR}/glib-${PV}"
-EXTRA_OECONF = "--disable-debug --enable-included-printf=no --disable-dtrace"
-EXTRA_OECONF_virtclass-native = "--disable-dtrace --disable-systemtap"
-EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no --disable-dtrace"
+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"
FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas"
FILES_${PN}-dev += "${libdir}/glib-2.0/include \