Patchwork [2/3] glib-2.0: ensure dtrace is diabled for all distro options and fix packaging

login
register
mail settings
Submitter Saul Wold
Date Jan. 5, 2012, 12:46 a.m.
Message ID <6095c22a0d0eb05296fe8f1a7052dd90ba478bfe.1325724295.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/18321/
State New
Headers show

Comments

Saul Wold - Jan. 5, 2012, 12:46 a.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 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(-)
Phil Blundell - Jan. 5, 2012, 8:05 a.m.
On Wed, 2012-01-04 at 16:46 -0800, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>

This patch seems to be missing the long checkin message.

> --disbale-dtrace"

Really?

p.
Saul Wold - Jan. 5, 2012, 8:12 a.m.
On 01/05/2012 12:05 AM, Phil Blundell wrote:
> On Wed, 2012-01-04 at 16:46 -0800, Saul Wold wrote:
>> Signed-off-by: Saul Wold<sgw@linux.intel.com>
>
> This patch seems to be missing the long checkin message.
>
>> --disbale-dtrace"
>
Dyslexia strikes again!  I did check this, but redid the commit from a 
different machine.

Thanks for catching this.

Sau!

> Really?
>
> p.
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

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"