summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-05-17 09:02:51 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-24 08:51:42 +0100
commit319b6f2708bbf71adb518b832309e891cb9edfb1 (patch)
treed63f1f3e6e39758456915c4394a279cbc5bbe33f
parent9ab9c52cfc10d36e5cc753cbe02fcf25470a999b (diff)
downloadpoky-319b6f2708bbf71adb518b832309e891cb9edfb1.tar.gz
glib-2.0: upgrade to 2.32.3
(From OE-Core rev: 1f73485a143f0aa6cd87636f3d36a7d1dfc40a3b) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch56
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.32.2.bb)7
2 files changed, 32 insertions, 31 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch b/meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch
index e9b3b26a27..0149767a16 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch
@@ -1,37 +1,37 @@
1Ideally there would be configureation option for this but there is not. We 1From 0040842024725c0e74f84c1719ead6c79ba94aba Mon Sep 17 00:00:00 2001
2can't allow this code since it could detect the host system's libelf with 2From: Martin Jansa <Martin.Jansa@gmail.com>
3disasterous effects when cross compiling. 3Date: Wed, 16 May 2012 20:03:34 +0200
4Subject: [PATCH] configure: add option to disable libelf support
4 5
5RP 2012/5/7 6Upstream-Status: Pending
6 7
7Upstream-Status: Pending (would need to be made a configure option to disabe) 8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 configure.ac | 4 ++++
11 1 files changed, 4 insertions(+), 0 deletions(-)
8 12
9Index: glib-2.32.2/configure.ac 13diff --git a/configure.ac b/configure.ac
10=================================================================== 14index aa65648..1bb49bf 100644
11--- glib-2.32.2.orig/configure.ac 2012-05-07 08:30:04.481149925 +0000 15--- a/configure.ac
12+++ glib-2.32.2/configure.ac 2012-05-07 08:31:02.185148588 +0000 16+++ b/configure.ac
13@@ -1816,23 +1816,7 @@ 17@@ -1815,6 +1815,9 @@ AC_SUBST(XATTR_LIBS)
18 dnl ************************
14 dnl *** check for libelf *** 19 dnl *** check for libelf ***
15 dnl ************************ 20 dnl ************************
21+AC_ARG_ENABLE(libelf,
22+ AC_HELP_STRING([--disable-libelf], [build without libelf support]))
23+if test "x$enable_libelf" != "xno"; then
24
25 PKG_CHECK_MODULES([LIBELF], [libelf], [have_libelf=yes], [have_libelf=maybe])
16 26
17-PKG_CHECK_MODULES([LIBELF], [libelf], [have_libelf=yes], [have_libelf=maybe]) 27@@ -1835,6 +1838,7 @@ fi
18- 28 if test $have_libelf = yes; then
19-if test $have_libelf = maybe; then 29 AC_DEFINE(HAVE_LIBELF, 1, [Define if libelf is available])
20- AC_CHECK_LIB([elf], [elf_begin], , [have_libelf=no]) 30 fi
21- AC_CHECK_LIB([elf], [elf_getshdrstrndx], , [have_libelf=no]) 31+fi
22- AC_CHECK_LIB([elf], [elf_getshdrnum], , [have_libelf=no])
23- AC_CHECK_HEADER([libelf.h], , [have_libelf=no])
24-
25- if test $have_libelf != no; then
26- LIBELF_LIBS=-lelf
27- have_libelf = yes
28- fi
29-fi
30-
31-if test $have_libelf = yes; then
32- AC_DEFINE(HAVE_LIBELF, 1, [Define if libelf is available])
33-fi
34+have_libelf=no
35 32
36 dnl **************************************** 33 dnl ****************************************
37 dnl *** platform dependent source checks *** 34 dnl *** platform dependent source checks ***
35--
361.7.8.6
37
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.32.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb
index b9b3356e65..c453941f4d 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.32.2.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb
@@ -1,7 +1,6 @@
1require glib.inc 1require glib.inc
2 2
3PE = "1" 3PE = "1"
4PR = "r1"
5 4
6DEPENDS += "libffi python-argparse-native zlib" 5DEPENDS += "libffi python-argparse-native zlib"
7DEPENDS_virtclass-native += "libffi-native python-argparse-native" 6DEPENDS_virtclass-native += "libffi-native python-argparse-native"
@@ -16,12 +15,14 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
16 file://nodbus.patch \ 15 file://nodbus.patch \
17 file://nolibelf.patch \ 16 file://nolibelf.patch \
18 " 17 "
19SRC_URI[md5sum] = "5bfdb6197afb90e4dbc7b1bb98f0eae0" 18SRC_URI[md5sum] = "9bd3ac535c24b6c162be13b2c43c5adc"
20SRC_URI[sha256sum] = "b1764abf00bac96e0e93e29fb9715ce75f3583579acac40648e18771d43d6136" 19SRC_URI[sha256sum] = "b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e40363ff4d"
21 20
22SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" 21SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
23BBCLASSEXTEND = "native nativesdk" 22BBCLASSEXTEND = "native nativesdk"
24 23
24EXTRA_OECONF = "--disable-libelf"
25
25PERLPATH = "${bindir}/env perl" 26PERLPATH = "${bindir}/env perl"
26PERLPATH_virtclass-native = "/usr/bin/env perl" 27PERLPATH_virtclass-native = "/usr/bin/env perl"
27PERLPATH_virtclass-nativesdk = "/usr/bin/env perl" 28PERLPATH_virtclass-nativesdk = "/usr/bin/env perl"