summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-07-20 07:48:59 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-22 11:50:34 +0100
commit482519c984a1b9da61b8b3cc97a6d28309b3192f (patch)
tree94dae748fcc3ccb8a388e3622d4668cf7aceb0d8
parent6c4ddd2d532ea91cd5752a7e56e8487cca1ac1e3 (diff)
downloadopenembedded-core-482519c984a1b9da61b8b3cc97a6d28309b3192f.tar.gz
openembedded-core-482519c984a1b9da61b8b3cc97a6d28309b3192f.tar.bz2
openembedded-core-482519c984a1b9da61b8b3cc97a6d28309b3192f.tar.xz
openembedded-core-482519c984a1b9da61b8b3cc97a6d28309b3192f.zip
glib-2.0: fix a compilation issue due to dtrace
With multilib & x32 builds dtrace is getting turned-on by the glib-2.0 configure, which causes following compilation failure. | x86_64-linux-libtool: link: ccache gcc -isystem/disk0/pokybuild/build-multilib/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -Wall -Wl,-rpath-link -Wl,/disk0/pokybuild/build-multilib/tmp/sysroots/x86_64-linux/usr/lib -Wl,-rpath -Wl,/disk0/pokybuild/build-multilib/tmp/sysroots/x86_64-linux/usr/lib -Wl,-O1 -o .libs/gtester gtester.o -L/disk0/pokybuild/build-multilib/tmp/sysroots/x86_64-linux/usr/lib ./.libs/libglib-2.0.so -lrt -Wl,-rpath -Wl,/disk0/pokybuild/build-multilib/tmp/sysroots/x86_64-linux/usr/lib | ./.libs/libglib-2.0.so: undefined reference to `GLIB_SLICE_ALLOC' | ./.libs/libglib-2.0.so: undefined reference to `GLIB_MEM_REALLOC' | ./.libs/libglib-2.0.so: undefined reference to `GLIB_SLICE_FREE' | ./.libs/libglib-2.0.so: undefined reference to `GLIB_MEM_ALLOC' | ./.libs/libglib-2.0.so: undefined reference to `GLIB_MEM_FREE' | ./.libs/libglib-2.0.so: undefined reference to `GLIB_QUARK_NEW' | collect2: ld returned 1 exit status | make[4]: *** [gtester] Error 1 Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb2
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb3
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
index 0b30d17bd..26fc8fb17 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
@@ -1,6 +1,6 @@
require glib.inc
-PR = "r5"
+PR = "r6"
SRC_URI = "${GNOME_MIRROR}/glib/2.27/glib-${PV}.tar.bz2 \
file://configure-libtool.patch \
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb
index a2e609f94..dce680233 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb
@@ -1,6 +1,6 @@
require glib.inc
-PR = "r2"
+PR = "r3"
PE = "1"
SRC_URI = "${GNOME_MIRROR}/glib/2.28/glib-${PV}.tar.bz2 \
@@ -20,3 +20,4 @@ SRC_URI[sha256sum] = "222f3055d6c413417b50901008c654865e5a311c73f0ae918b0a9978d1
BBCLASSEXTEND = "native"
+EXTRA_OECONF_append = " --enable-dtrace=no"