summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-11-05 16:22:48 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-12 13:36:38 +0000
commit35d5e2f67aef361c2ab20ab764142d9f98eed855 (patch)
tree82f4d9c42c91a127bf263e61a1f9c375d8c0c2bb /meta
parent970aa6dd064b992ad677fd9271d733b3be414af8 (diff)
downloadpoky-35d5e2f67aef361c2ab20ab764142d9f98eed855.tar.gz
glib-2.0: upgrade to latest stable, 2.34.1.
Also explicitly disable the test suite (as we can't run it), subsequently dropping 60_wait-longer-for-threads-to-die.patch and nodbus.patch. nolibelf.patch has been merged upstream, drop. Upstream has dropped the pre-generated man pages, to generate them again we'd need libxslt and the DocBook infrastructure. We can live without the man pages as those build-dependencies are non-trivial. (From OE-Core rev: ce5fcad59fff19dbffc2d7b49c0c8bf3701d17ed) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch33
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch25
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch40
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.34.1.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb)10
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc2
5 files changed, 4 insertions, 106 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch b/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
deleted file mode 100644
index 4ff7b80075..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1copy from OE, said to borrow from Ubuntu. Not in glib-2.0 upstream yet. Add for sanity.
2Added to poky by Kevin Tian <kevin.tian@intel.com>, 06/25/2010
3Rebased for glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com>, 11/16/2010
4
5Upstream-Status: Inappropriate [patches for test code]
6
7diff -ruN glib-2.30.0-orig/tests/threadpool-test.c glib-2.30.0/tests/threadpool-test.c
8--- glib-2.30.0-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800
9+++ glib-2.30.0/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800
10@@ -5,8 +5,8 @@
11
12 #include <glib.h>
13
14-#define DEBUG_MSG(x)
15-/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); */
16+/* #define DEBUG_MSG(x) */
17+#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");
18
19 #define WAIT 5 /* seconds */
20 #define MAX_THREADS 10
21@@ -130,10 +130,10 @@
22 test_count_threads () == 0)
23 break;
24
25- DEBUG_MSG (("[unused] waiting ONE second for threads to die"));
26+ DEBUG_MSG (("[unused] waiting FIVE second for threads to die"));
27
28 /* Some time for threads to die. */
29- g_usleep (G_USEC_PER_SEC);
30+ g_usleep (5 * G_USEC_PER_SEC);
31 }
32
33 DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist",
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch b/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch
deleted file mode 100644
index 1e65643191..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Disable dbus dependency. Autodetecting isn't deterministic, we don't have the DEPENDS
2and we don't want to built this piece so hardcode it off.
3
4Upstream-Status: Inappropriate [configuration]
5
6RP 2012/2/25
7
8Index: glib-2.30.2/configure.ac
9===================================================================
10--- glib-2.30.2.orig/configure.ac 2012-02-25 14:50:07.444242397 +0000
11+++ glib-2.30.2/configure.ac 2012-02-25 14:51:28.096240485 +0000
12@@ -3769,10 +3769,9 @@
13 # Check for libdbus1 - Optional - is only used in the GDBus test cases
14 #
15 # 1.2.14 required for dbus_message_set_serial
16-PKG_CHECK_MODULES(DBUS1,
17- dbus-1 >= 1.2.14,
18- [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is available]) have_dbus1=yes],
19- have_dbus1=no)
20+DBUS1_CFLAGS=
21+DBUS1_LIBS=
22+$have_dbus1=no
23 AC_SUBST(DBUS1_CFLAGS)
24 AC_SUBST(DBUS1_LIBS)
25 AM_CONDITIONAL(HAVE_DBUS1, [test "x$have_dbus1" = "xyes"])
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
deleted file mode 100644
index d310041165..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From e1252cbf65001487ff3b94bbc141acacf6e528b6 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 16 May 2012 20:03:34 +0200
4Subject: [PATCH] configure: add option to disable libelf support
5
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
10
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 configure.ac | 4 ++++
14 1 files changed, 4 insertions(+), 0 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index ed4c10e..210df90 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -1815,6 +1815,9 @@ AC_SUBST(XATTR_LIBS)
21 dnl ************************
22 dnl *** check for libelf ***
23 dnl ************************
24+AC_ARG_ENABLE(libelf,
25+ AC_HELP_STRING([--disable-libelf], [build without libelf support]))
26+if test "x$enable_libelf" != "xno"; then
27
28 PKG_CHECK_MODULES([LIBELF], [libelf >= 0.8.12], [have_libelf=yes], [have_libelf=maybe])
29
30@@ -1835,6 +1838,7 @@ fi
31 if test $have_libelf = yes; then
32 AC_DEFINE(HAVE_LIBELF, 1, [Define if libelf is available])
33 fi
34+fi
35
36 dnl ****************************************
37 dnl *** platform dependent source checks ***
38--
391.7.8.6
40
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.34.1.bb
index 22c6c7bef0..18a155de8c 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.34.1.bb
@@ -1,6 +1,6 @@
1require glib.inc 1require glib.inc
2 2
3PR = "r6" 3PR = "r0"
4PE = "1" 4PE = "1"
5 5
6DEPENDS += "libffi python-argparse-native zlib" 6DEPENDS += "libffi python-argparse-native zlib"
@@ -11,19 +11,15 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]
11 11
12SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ 12SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
13 file://configure-libtool.patch \ 13 file://configure-libtool.patch \
14 file://60_wait-longer-for-threads-to-die.patch \
15 file://glib-2.0_fix_for_x32.patch \ 14 file://glib-2.0_fix_for_x32.patch \
16 file://nodbus.patch \
17 file://nolibelf.patch \
18 " 15 "
19SRC_URI[md5sum] = "bf84fefd9c1a5b5a7a38736f4ddd674a" 16SRC_URI[md5sum] = "ee779493b083be9348a841e0a51f1b27"
20SRC_URI[sha256sum] = "a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2" 17SRC_URI[sha256sum] = "6e84dc9d84b104725b34d255421ed7ac3629e49f437d37addde5ce3891c2e2f1"
21 18
22SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" 19SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
23BBCLASSEXTEND = "native nativesdk" 20BBCLASSEXTEND = "native nativesdk"
24 21
25do_configure_prepend() { 22do_configure_prepend() {
26 sed -i -e "s:TEST_PROGS += gdbus-serialization::g" ${S}/gio/tests/Makefile.am
27 sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in 23 sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in
28} 24}
29 25
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 586e45ac7f..ed9bed9818 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -25,7 +25,7 @@ inherit autotools gettext gtk-doc pkgconfig
25 25
26S = "${WORKDIR}/glib-${PV}" 26S = "${WORKDIR}/glib-${PV}"
27 27
28CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap" 28CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-modular-tests"
29 29
30EXTRA_OECONF = "--enable-included-printf=no ${CORECONF}" 30EXTRA_OECONF = "--enable-included-printf=no ${CORECONF}"
31EXTRA_OECONF_class-native = "${CORECONF}" 31EXTRA_OECONF_class-native = "${CORECONF}"