[oe-commits] Saul Wold : glib-2.0: ensure dtrace is diabled for all distro options and fix packaging

[git at git.openembedded.org]

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

Author: Saul Wold <sgw at linux.intel.com>
Date:   Wed Jan  4 16:46:26 2012 -0800

glib-2.0: ensure dtrace is diabled for all distro options and fix packaging

The linuxstdbase configuration flags also need to disable dtrace as per the
sandard package configuration options.

Signed-off-by: Saul Wold <sgw at linux.intel.com>
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           |    9 ++++++---
 2 files changed, 7 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 9b7c229..bdf92aa 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 = "r1"
+PR = "r2"
 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 6c8bd68..d553869 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -27,11 +27,14 @@ 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"
+EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no --disable-dtrace"
 
 FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas"
-FILES_${PN}-dev += "${libdir}/glib-2.0/include"
-FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb"
+FILES_${PN}-dev += "${libdir}/glib-2.0/include \
+                    ${libdir}/gio/modules/lib*${SOLIBSDEV} \
+                    ${libdir}/gio/modules/*.la"
+FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb \
+                    ${libdir}/gio/modules/.debug"
 
 ARM_INSTRUCTION_SET = "arm"
 USE_NLS = "yes"