summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-09-16 08:06:15 +0000
committerKoen Kooi <koen@openembedded.org>2007-09-16 08:06:15 +0000
commit4817ec8a6676371bf245d0514efcc6dd21549d8e (patch)
tree5303b555573eeca06f13ee923099a756d7daa715
parent102fc40c1d84e8e51443c9fd0b1c367082a80ea0 (diff)
glib 2.0: add 2.12.13 and 2.14.0 from poky
-rw-r--r--packages/glib-2.0/files/atomic_fix.patch16
-rw-r--r--packages/glib-2.0/glib-2.0-2.12.13/.mtn2git_empty0
-rw-r--r--packages/glib-2.0/glib-2.0-2.12.13/configure-libtool.patch11
-rw-r--r--packages/glib-2.0/glib-2.0-2.14.0/.mtn2git_empty0
-rw-r--r--packages/glib-2.0/glib-2.0-2.14.0/configure-libtool.patch29
-rw-r--r--packages/glib-2.0/glib-2.0_2.12.13.bb8
-rw-r--r--packages/glib-2.0/glib-2.0_2.14.0.bb5
7 files changed, 69 insertions, 0 deletions
diff --git a/packages/glib-2.0/files/atomic_fix.patch b/packages/glib-2.0/files/atomic_fix.patch
new file mode 100644
index 0000000000..ddc7ada778
--- /dev/null
+++ b/packages/glib-2.0/files/atomic_fix.patch
@@ -0,0 +1,16 @@
+Index: glib-2.10.3/glib/gthread.c
+===================================================================
+--- glib-2.10.3.orig/glib/gthread.c 2005-12-01 16:34:26.000000000 +0000
++++ glib-2.10.3/glib/gthread.c 2006-07-06 08:17:18.000000000 +0100
+@@ -164,10 +164,10 @@
+ _g_messages_thread_init_nomessage ();
+
+ /* we may run full-fledged initializers from here */
++ _g_atomic_thread_init ();
+ _g_convert_thread_init ();
+ _g_rand_thread_init ();
+ _g_main_thread_init ();
+- _g_atomic_thread_init ();
+ _g_utils_thread_init ();
+ #ifdef G_OS_WIN32
+ _g_win32_thread_init ();
diff --git a/packages/glib-2.0/glib-2.0-2.12.13/.mtn2git_empty b/packages/glib-2.0/glib-2.0-2.12.13/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0-2.12.13/.mtn2git_empty
diff --git a/packages/glib-2.0/glib-2.0-2.12.13/configure-libtool.patch b/packages/glib-2.0/glib-2.0-2.12.13/configure-libtool.patch
new file mode 100644
index 0000000000..bfec12eec9
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0-2.12.13/configure-libtool.patch
@@ -0,0 +1,11 @@
+--- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100
++++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100
+@@ -1174,7 +1174,7 @@
+ G_MODULE_LDFLAGS=
+ else
+ export SED
+- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ fi
+ dnl G_MODULE_IMPL= don't reset, so cmd-line can override
+ G_MODULE_NEED_USCORE=0
diff --git a/packages/glib-2.0/glib-2.0-2.14.0/.mtn2git_empty b/packages/glib-2.0/glib-2.0-2.14.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0-2.14.0/.mtn2git_empty
diff --git a/packages/glib-2.0/glib-2.0-2.14.0/configure-libtool.patch b/packages/glib-2.0/glib-2.0-2.14.0/configure-libtool.patch
new file mode 100644
index 0000000000..a52327c8c9
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0-2.14.0/configure-libtool.patch
@@ -0,0 +1,29 @@
+--- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100
++++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100
+@@ -1174,7 +1174,7 @@
+ G_MODULE_LDFLAGS=
+ else
+ export SED
+- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ fi
+ dnl G_MODULE_IMPL= don't reset, so cmd-line can override
+ G_MODULE_NEED_USCORE=0
+@@ -1265,7 +1265,7 @@
+ LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
+ dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
+ echo "void glib_plugin_test(void) { }" > plugin.c
+- ${SHELL} ./libtool --mode=compile ${CC} -shared \
++ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \
+ -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
+ AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
+ glib_cv_rtldglobal_broken,[
+@@ -1339,7 +1339,7 @@
+
+ AC_MSG_CHECKING(for the suffix of shared libraries)
+ export SED
+-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
++shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='`
+ eval $shrext_cmds
+ module=yes eval std_shrext=$shrext_cmds
+ # chop the initial dot
diff --git a/packages/glib-2.0/glib-2.0_2.12.13.bb b/packages/glib-2.0/glib-2.0_2.12.13.bb
new file mode 100644
index 0000000000..2e5259073a
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0_2.12.13.bb
@@ -0,0 +1,8 @@
+require glib.inc
+
+PR = "r2"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
+ file://glibconfig-sysdefs.h \
+ file://configure-libtool.patch;patch=1"
+
diff --git a/packages/glib-2.0/glib-2.0_2.14.0.bb b/packages/glib-2.0/glib-2.0_2.14.0.bb
new file mode 100644
index 0000000000..995efbd119
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0_2.14.0.bb
@@ -0,0 +1,5 @@
+require glib.inc
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${PV}.tar.bz2 \
+ file://glibconfig-sysdefs.h \
+ file://configure-libtool.patch;patch=1"