From patchwork Thu Jan 5 06:30:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 16/28] glib-2.0: ensure dtrace is diabled for all distro options and fix packaging Date: Thu, 05 Jan 2012 06:30:41 -0000 From: Saul Wold X-Patchwork-Id: 18385 Message-Id: <9e88de502e60ffab47739d10a72cf5a1c8a90a48.1325744640.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org Signed-off-by: Saul Wold --- 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..b1033ea 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 --disbale-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"