[oe-commits] Richard Purdie : glib-2.0: Disable fam, we don't depend on it

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: e1d5a81bf78786dcb11a4840436f46ba9ec4010e
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e1d5a81bf78786dcb11a4840436f46ba9ec4010e

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Mon Feb 27 12:16:31 2012 +0000

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 at linuxfoundation.org>

---

 meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb |    2 +-
 meta/recipes-core/glib-2.0/glib.inc           |    6 +++---
 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 0b26575..0e96fc1 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 6eddf8f..835743a 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 \