4 files changed, 31 insertions, 1 deletions

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 50d7e1bbec..546bf52b8d 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -192,7 +192,7 @@ PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
 PREFERRED_VERSION_sato-icon-theme ?= "0.1"
 
 PREFERRED_VERSION_glib-2.0 ?= "2.14.5"
-PREFERRED_VERSION_glib-2.0-native ?= "2.12.13"
+PREFERRED_VERSION_glib-2.0-native ?= "2.14.5"
 PREFERRED_VERSION_atk ?= "1.20.0"
 PREFERRED_VERSION_cairo ?= "1.4.10"
 PREFERRED_VERSION_pango ?= "1.18.3"
diff --git a/meta/packages/glib-2.0/glib-2.0-native-2.14.5/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-native-2.14.5/configure-libtool.patch
new file mode 100644
index 0000000000..a52327c8c9
--- /dev/null
+++ b/meta/packages/glib-2.0/glib-2.0-native-2.14.5/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/meta/packages/glib-2.0/glib-2.0-native-2.12.13/glib-gettextize-dir.patch b/meta/packages/glib-2.0/glib-2.0-native-2.14.5/glib-gettextize-dir.patch
index efe3325578..efe3325578 100644
--- a/meta/packages/glib-2.0/glib-2.0-native-2.12.13/glib-gettextize-dir.patch
+++ b/meta/packages/glib-2.0/glib-2.0-native-2.14.5/glib-gettextize-dir.patch
diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.12.13.bb b/meta/packages/glib-2.0/glib-2.0-native_2.14.5.bb
index e2c54e631b..8a6e27d3ea 100644
--- a/meta/packages/glib-2.0/glib-2.0-native_2.12.13.bb
+++ b/meta/packages/glib-2.0/glib-2.0-native_2.14.5.bb
@@ -11,6 +11,7 @@ PR="r2"
 
 SRC_URI = "http://download.gnome.org/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glib-gettextize-dir.patch;patch=1 \
+           file://configure-libtool.patch;patch=1 \
            file://glibconfig-sysdefs.h"
 
 S = "${WORKDIR}/glib-${PV}"