From f420fb3de1f588a51dd6009452c7836903fa9158 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 27 Feb 2012 12:16:31 +0000 Subject: 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 --- 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 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 @@ 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 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 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 \ -- cgit v1.2.3-54-g00ecf