aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-01-04 16:46:26 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-05 11:16:02 +0000
commit6f4268682c33df7537a32f6e52d3698ebfa14e4e (patch)
treef3df899614e4ba28dbc5bcdfb507fa1e84c3c356 /meta/recipes-core/glib-2.0
parent6de454e0a66e832571b23406fdc4b9c4e65073d0 (diff)
downloadopenembedded-core-contrib-6f4268682c33df7537a32f6e52d3698ebfa14e4e.tar.gz
openembedded-core-contrib-6f4268682c33df7537a32f6e52d3698ebfa14e4e.tar.bz2
openembedded-core-contrib-6f4268682c33df7537a32f6e52d3698ebfa14e4e.zip
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@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0')
-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.inc9
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 9b7c2298b1c..bdf92aaab70 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 6c8bd683a38..d553869f654 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"