summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/poky-bleeding.conf2
-rw-r--r--meta/packages/glib-2.0/glib-2.0-2.12.10/configure-libtool.patch11
-rw-r--r--meta/packages/glib-2.0/glib-2.0_2.12.10.bb (renamed from meta/packages/glib-2.0/glib-2.0_2.12.6.bb)0
3 files changed, 12 insertions, 1 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index 9aaa7e4f0..93c5b54ef 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 000000000..bfec12eec
--- /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
index 4d8e59b35..4d8e59b35 100644
--- 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