summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch54
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch24
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.32.1.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb)5
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc2
4 files changed, 41 insertions, 44 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
index c21e378491..1d69a3f290 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
@@ -1,15 +1,31 @@
1# Poky renames libtool to $host_alias-libtool. 1From 1c5718648d49e795efee91c220a2bf9386c184f2 Mon Sep 17 00:00:00 2001
2# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2 2From: Martin Jansa <Martin.Jansa@gmail.com>
3# so we can't call # it at this point. We can safely assume a version is available 3Date: Sat, 28 Apr 2012 18:24:50 +0200
4# from PATH though 4Subject: [PATCH] configure: use $host_alias-libtool instead of libtool
5# Rebased to glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com> 5 directly
6
7Poky renames libtool to $host_alias-libtool.
8./$host_alias-libtool isn't created until after configure runs with
9libtool >= 2.2.2
10so we can't call # it at this point. We can safely assume a version is
11available
12from PATH though
13
14Rebased to glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com>
15Rebased to glib-2.32.1 by Martin Jansa <Martin.Jansa@gmail.com>
6 16
7Upstream-Status: Inappropriate [configuration] 17Upstream-Status: Inappropriate [configuration]
8 18
9diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac 19Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10--- glib-2.27.3-orig/configure.ac 2010-11-03 11:02:05.000000000 +0800 20---
11+++ glib-2.27.3/configure.ac 2010-11-16 12:38:12.610485990 +0800 21 configure.ac | 8 ++++----
12@@ -1385,7 +1385,7 @@ 22 1 files changed, 4 insertions(+), 4 deletions(-)
23
24diff --git a/configure.ac b/configure.ac
25index a6478c6..9a93d60 100644
26--- a/configure.ac
27+++ b/configure.ac
28@@ -1470,7 +1470,7 @@ if test x"$glib_native_win32" = xyes; then
13 G_MODULE_LDFLAGS= 29 G_MODULE_LDFLAGS=
14 else 30 else
15 export SED 31 export SED
@@ -18,16 +34,19 @@ diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac
18 fi 34 fi
19 dnl G_MODULE_IMPL= don't reset, so cmd-line can override 35 dnl G_MODULE_IMPL= don't reset, so cmd-line can override
20 G_MODULE_NEED_USCORE=0 36 G_MODULE_NEED_USCORE=0
21@@ -1450,7 +1450,7 @@ 37@@ -1535,9 +1535,9 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then
22 LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" 38 LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
23 dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness 39 dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
24 echo "void glib_plugin_test(void) { }" > plugin.c 40 echo "void glib_plugin_test(void) { }" > plugin.c
25- ${SHELL} ./libtool --mode=compile ${CC} -shared \ 41- ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
26+ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \ 42+ ${SHELL} ./$host_alias-libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
27 -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null 43 ${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1
28 AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], 44- ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
29 glib_cv_rtldglobal_broken,[ 45+ ${SHELL} ./$host_alias-libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
30@@ -1524,7 +1524,7 @@ 46 ${LDFLAGS} -module -o plugin.la -export-dynamic \
47 -shrext ".o" -avoid-version plugin.lo \
48 -rpath /dont/care >/dev/null 2>&1
49@@ -1614,7 +1614,7 @@ fi
31 50
32 AC_MSG_CHECKING(for the suffix of module shared libraries) 51 AC_MSG_CHECKING(for the suffix of module shared libraries)
33 export SED 52 export SED
@@ -36,3 +55,6 @@ diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac
36 eval $shrext_cmds 55 eval $shrext_cmds
37 module=yes eval std_shrext=$shrext_cmds 56 module=yes eval std_shrext=$shrext_cmds
38 # chop the initial dot 57 # chop the initial dot
58--
591.7.8.6
60
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch b/meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch
deleted file mode 100644
index 2eaa19b604..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1fix g_once_init_enter compile failure
2
3Kernelshark trips over a compile bug in glib-2.0 addressed by Open Embedded
4back in the 2.22 timeframe. It appears to still be present in 2.27.
5
6http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg005
7
8Signed-off-by: Darren Hart <dvhart@linux.intel.com>
9
10Upstream-Status: Pending
11
12Index: glib-2.27.5/glib/gthread.h
13===================================================================
14--- glib-2.27.5.orig/glib/gthread.h
15+++ glib-2.27.5/glib/gthread.h
16@@ -344,7 +344,7 @@ void g_once_init_leav
17 G_INLINE_FUNC gboolean
18 g_once_init_enter (volatile gsize *value_location)
19 {
20- if G_LIKELY ((gpointer) g_atomic_pointer_get (value_location) != NULL)
21+ if G_LIKELY ((gpointer) g_atomic_pointer_get ((volatile gpointer *)value_location) != NULL)
22 return FALSE;
23 else
24 return g_once_init_enter_impl (value_location);
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.32.1.bb
index 405402e7ea..a62c91a3c2 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.32.1.bb
@@ -12,12 +12,11 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]
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 \ 14 file://60_wait-longer-for-threads-to-die.patch \
15 file://g_once_init_enter.patch \
16 file://glib-2.0_fix_for_x32.patch \ 15 file://glib-2.0_fix_for_x32.patch \
17 file://nodbus.patch \ 16 file://nodbus.patch \
18 " 17 "
19SRC_URI[md5sum] = "0f9fa329c6c1012d0fd861ad3d8a4520" 18SRC_URI[md5sum] = "032c7cf9868c9aa186b490b155a41144"
20SRC_URI[sha256sum] = "e6cbb27c71c445993346e785e8609cc75cea2941e32312e544872feba572dd27" 19SRC_URI[sha256sum] = "484d5b7fc09f3fa398355adaf74b369768f5859866c299f229c99721990f8398"
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"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 835743aa98..33f76131b9 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
8 file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ 8 file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
9 file://gmodule/gmodule.h;startline=4;endline=17;md5=76ab161b37202cd004073c42fac276ed \ 9 file://gmodule/gmodule.h;startline=4;endline=17;md5=76ab161b37202cd004073c42fac276ed \
10 file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \ 10 file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \
11 file://glib/pcre/pcre.h;startline=11;endline=35;md5=ce867cf87ebbd2bb55e980d90328390d \ 11 file://glib/pcre/pcre.h;startline=11;endline=35;md5=2ffb79f0a0933f282f4f36cda635683d \
12 file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" 12 file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc"
13BUGTRACKER = "http://bugzilla.gnome.org" 13BUGTRACKER = "http://bugzilla.gnome.org"
14SECTION = "libs" 14SECTION = "libs"