glib-2.0: Fix issues with libelf dependency creeping in
PATCH 1/1 glib-2.0: Fix issues with libelf dependency creeping in
---
meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch renamed from dev/null +37 -0
@@ -0,0 +1,37 @@ +Ideally there would be configureation option for this but there is not. We +can't allow this code since it could detect the host system's libelf with +disasterous effects when cross compiling. + +RP 2012/5/7 + +Upstream-Status: Pending (would need to be made a configure option to disabe) + +Index: glib-2.32.2/configure.ac +=================================================================== +--- glib-2.32.2.orig/configure.ac 2012-05-07 08:30:04.481149925 +0000 ++++ glib-2.32.2/configure.ac 2012-05-07 08:31:02.185148588 +0000 +@@ -1816,23 +1816,7 @@ + dnl *** check for libelf *** + dnl ************************ + +-PKG_CHECK_MODULES([LIBELF], [libelf], [have_libelf=yes], [have_libelf=maybe]) +- +-if test $have_libelf = maybe; then +- AC_CHECK_LIB([elf], [elf_begin], , [have_libelf=no]) +- AC_CHECK_LIB([elf], [elf_getshdrstrndx], , [have_libelf=no]) +- AC_CHECK_LIB([elf], [elf_getshdrnum], , [have_libelf=no]) +- AC_CHECK_HEADER([libelf.h], , [have_libelf=no]) +- +- if test $have_libelf != no; then +- LIBELF_LIBS=-lelf +- have_libelf = yes +- fi +-fi +- +-if test $have_libelf = yes; then +- AC_DEFINE(HAVE_LIBELF, 1, [Define if libelf is available]) +-fi ++have_libelf=no + + dnl **************************************** + dnl *** platform dependent source checks ***
meta/recipes-core/glib-2.0/glib-2.0_2.32.2.bb +2 -0
@@ -1,6 +1,7 @@ require glib.inc PE = "1" +PR = "r1" DEPENDS += "libffi python-argparse-native zlib" DEPENDS_virtclass-native += "libffi-native python-argparse-native"
@@ -13,6 +14,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://60_wait-longer-for-threads-to-die.patch \ file://glib-2.0_fix_for_x32.patch \ file://nodbus.patch \ + file://nolibelf.patch \ " SRC_URI[md5sum] = "5bfdb6197afb90e4dbc7b1bb98f0eae0" SRC_URI[sha256sum] = "b1764abf00bac96e0e93e29fb9715ce75f3583579acac40648e18771d43d6136"
meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch line 1
Quoted 9 lines · Richard Purdie
Signed-off-by Richard Purdie <[email protected]>---
meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch renamed from dev/null +1
-0@@ -0,0 +1,37 @@ +Ideally there would be configureation option for this but there is not. We
typo
meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch line 7
Quoted 6 lines
meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch renamed from dev/null +6
-0+can't allow this code since it could detect the host system's libelf with +disasterous effects when cross compiling. + +RP 2012/5/7 + +Upstream-Status: Pending (would need to be made a configure option to disabe)
typo
Quoted 57 lines
meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch renamed from dev/null +30
-0+ +Index: glib-2.32.2/configure.ac +=================================================================== +--- glib-2.32.2.orig/configure.ac 2012-05-07 08:30:04.481149925 +0000 ++++ glib-2.32.2/configure.ac 2012-05-07 08:31:02.185148588 +0000 +@@ -1816,23 +1816,7 @@ + dnl *** check for libelf *** + dnl ************************ + +-PKG_CHECK_MODULES([LIBELF], [libelf], [have_libelf=yes], [have_libelf=maybe]) +- +-if test $have_libelf = maybe; then +- AC_CHECK_LIB([elf], [elf_begin], , [have_libelf=no]) +- AC_CHECK_LIB([elf], [elf_getshdrstrndx], , [have_libelf=no]) +- AC_CHECK_LIB([elf], [elf_getshdrnum], , [have_libelf=no]) +- AC_CHECK_HEADER([libelf.h], , [have_libelf=no]) +- +- if test $have_libelf != no; then +- LIBELF_LIBS=-lelf +- have_libelf = yes +- fi +-fi +- +-if test $have_libelf = yes; then +- AC_DEFINE(HAVE_LIBELF, 1, [Define if libelf is available]) +-fi ++have_libelf=no + + dnl **************************************** + dnl *** platform dependent source checks ***meta/recipes-core/glib-2.0/glib-2.0_2.32.2.bb +0
-0@@ -1,6 +1,7 @@require glib.inc
PE = "1"
+PR = "r1"DEPENDS += "libffi python-argparse-native zlib" DEPENDS_virtclass-native += "libffi-native python-argparse-native"
meta/recipes-core/glib-2.0/glib-2.0_2.32.2.bb +1
-0@@ -13,6 +14,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://60_wait-longer-for-threads-to-die.patch \ file://glib-2.0_fix_for_x32.patch \ file://nodbus.patch \ + file://nolibelf.patch \"
SRC_URI[md5sum] = "5bfdb6197afb90e4dbc7b1bb98f0eae0"
SRC_URI[sha256sum] = "b1764abf00bac96e0e93e29fb9715ce75f3583579acac40648e18771d43d6136"_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch line 3
Quoted 11 lines · Richard Purdie
Signed-off-by Richard Purdie <[email protected]>---
meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch renamed from dev/null +3
-0@@ -0,0 +1,37 @@ +Ideally there would be configureation option for this but there is not. We +can't allow this code since it could detect the host system's libelf with +disasterous effects when cross compiling.
Random request - could you guys also CC patches to GNOME stuff to me? I do review patches to GLib fairly actively.
As far as removing the libelf support; note this means GResource won't work which in turn means gtk3 won't work (at the moment).
Anyways, a patch to add a configuration option is really, really trivial if one has a checkout of git, if someone files a bug with a rationale I can do a patch.