summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0/glib-2.0
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-07-16 18:07:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 10:53:59 +0100
commita94e5d27797a01e17b2aa698b11671219581b013 (patch)
treef93759c7f3d2603b68b3dad77ff02723fe51069e /meta/recipes-core/glib-2.0/glib-2.0
parent0e53886ced4364271d5561433d02b75063599b27 (diff)
downloadpoky-a94e5d27797a01e17b2aa698b11671219581b013.tar.gz
glib: upgrade to 2.32.4
* it's bugfix release, see http://ftp.gnome.org/pub/gnome/sources/glib/2.32/glib-2.32.4.news for list of fixed bugs (From OE-Core rev: 85a930188300152bc9a1bbf640a2441f3177e26f) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch11
1 files changed, 7 insertions, 4 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 0149767a16..d310041165 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,9 +1,12 @@
1From 0040842024725c0e74f84c1719ead6c79ba94aba Mon Sep 17 00:00:00 2001 1From e1252cbf65001487ff3b94bbc141acacf6e528b6 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 16 May 2012 20:03:34 +0200 3Date: Wed, 16 May 2012 20:03:34 +0200
4Subject: [PATCH] configure: add option to disable libelf support 4Subject: [PATCH] configure: add option to disable libelf support
5 5
6Upstream-Status: Pending 6Upstream-Status: Backport
7Applied in master
8http://git.gnome.org/browse/glib/commit/?id=9e1d4da14d8e69fb60da1a9733ac1d58d0dcd8b2
9can be dropped when upgrading to 2.34.* or newer
7 10
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9--- 12---
@@ -11,7 +14,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11 1 files changed, 4 insertions(+), 0 deletions(-) 14 1 files changed, 4 insertions(+), 0 deletions(-)
12 15
13diff --git a/configure.ac b/configure.ac 16diff --git a/configure.ac b/configure.ac
14index aa65648..1bb49bf 100644 17index ed4c10e..210df90 100644
15--- a/configure.ac 18--- a/configure.ac
16+++ b/configure.ac 19+++ b/configure.ac
17@@ -1815,6 +1815,9 @@ AC_SUBST(XATTR_LIBS) 20@@ -1815,6 +1815,9 @@ AC_SUBST(XATTR_LIBS)
@@ -22,7 +25,7 @@ index aa65648..1bb49bf 100644
22+ AC_HELP_STRING([--disable-libelf], [build without libelf support])) 25+ AC_HELP_STRING([--disable-libelf], [build without libelf support]))
23+if test "x$enable_libelf" != "xno"; then 26+if test "x$enable_libelf" != "xno"; then
24 27
25 PKG_CHECK_MODULES([LIBELF], [libelf], [have_libelf=yes], [have_libelf=maybe]) 28 PKG_CHECK_MODULES([LIBELF], [libelf >= 0.8.12], [have_libelf=yes], [have_libelf=maybe])
26 29
27@@ -1835,6 +1838,7 @@ fi 30@@ -1835,6 +1838,7 @@ fi
28 if test $have_libelf = yes; then 31 if test $have_libelf = yes; then