Skip to contentSkip to conversation

redo the glib-2.0 fix

PATCH Applied [email protected] 2 participants 4 messages Jul 21, 2011 – Jul 22, 2011

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover redo the glib-2.0 fix

From: Nitin A Kamble <[email protected]>

The following changes since commit db0eff4b964055b18ca5f91e55b7cf0d4a55c832:

python: fix security vulnerability (2011-07-21 02:23:27 -0700)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/misc
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/misc

Nitin A Kamble (1):
glib-2.0: fix a compilation issue due to dtrace

 meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb |    2 +-
 meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.6
author
#1 lore raw

PATCH 1/1 glib-2.0: fix a compilation issue due to dtrace

From: Nitin A Kamble <[email protected]>

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 <[email protected]>
---
 meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb |    2 +-
 meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb +1 -1
index 0b30d17..26fc8fb 100644
@@ -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 \
meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb +2 -1
index a2e609f..dce6802 100644
@@ -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"
Signature · 1 line
1.7.6
#2 lore raw

Re: [PATCH 1/1] glib-2.0: fix a compilation issue due to dtrace

Quoted 35 lines · On 07/21/2011 04:09 AM, [email protected] wrote:

From: Nitin A Kamble<[email protected]>

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

(quoted diff) +0 -7
-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<[email protected]>
---
  meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb |    2 +-
  meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb |    3 ++-
  2 files changed, 3 insertions(+), 2 deletions(-)
meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb +0 -0
index 0b30d17..26fc8fb 100644

meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb line 4

Quoted 5 lines
meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb +1 -1
@@ -1,6 +1,6 @@
  require glib.inc
 
-PR = "r5"
+PR = "r6"

Why do you bump the PR here?

Sau!

Quoted 19 lines
meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb +0 -0
  SRC_URI = "${GNOME_MIRROR}/glib/2.27/glib-${PV}.tar.bz2 \
             file://configure-libtool.patch \
meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb +2 -1
index a2e609f..dce6802 100644
@@ -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"
Applied
#3 lore raw
In reply to [email protected]
Quoted 10 lines · On 07/21/2011 04:09 AM, [email protected] wrote:

From: Nitin A Kamble<[email protected]>

The following changes since commit db0eff4b964055b18ca5f91e55b7cf0d4a55c832:

   python: fix security vulnerability (2011-07-21 02:23:27 -0700)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/misc
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/misc

Quoted 7 lines

Nitin A Kamble (1):
glib-2.0: fix a compilation issue due to dtrace

  meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb |    2 +-
  meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb |    3 ++-
  2 files changed, 3 insertions(+), 2 deletions(-)

Merged into OE-Core

Thanks
Sau!