From: Ross Burton <ross@openedhand.com>
Date: Wed, 7 Mar 2007 19:16:22 +0000 (+0000)
Subject: Upgrade glib 2.12.x to 2.12.10
X-Git-Tag: 2011-1~12079
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f39c891bb648b6be7de8bc8b0c4345a073742656;p=openembedded-core.git

Upgrade glib 2.12.x to 2.12.10

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1334 311d38ba-8fff-0310-9ca6-ca027cbcb966
---

diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index 9aaa7e4f03..93c5b54ef2 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -1,4 +1,4 @@
-PREFERRED_VERSION_glib-2.0 ?= "2.12.6"
+PREFERRED_VERSION_glib-2.0 ?= "2.12.10"
 PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
 
 PREFERRED_VERSION_cairo ?= "1.4.0"
diff --git a/meta/packages/glib-2.0/glib-2.0-2.12.10/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.12.10/configure-libtool.patch
new file mode 100644
index 0000000000..bfec12eec9
--- /dev/null
+++ b/meta/packages/glib-2.0/glib-2.0-2.12.10/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/meta/packages/glib-2.0/glib-2.0_2.12.6.bb b/meta/packages/glib-2.0/glib-2.0_2.12.10.bb
similarity index 100%
rename from meta/packages/glib-2.0/glib-2.0_2.12.6.bb
rename to meta/packages/glib-2.0/glib-2.0_2.12.10.bb