summaryrefslogtreecommitdiffstats
path: root/meta/packages/glib-2.0
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-01-13 16:50:00 +0000
committerRoss Burton <ross@openedhand.com>2008-01-13 16:50:00 +0000
commitea38a634d72f5000ce5c8e3fe2309126046d281e (patch)
treeeb6ba44b86482fe6cbfd5e6f16e86159e49efa3c /meta/packages/glib-2.0
parentf364836768440e062f7886f19e6d34d691796538 (diff)
downloadpoky-ea38a634d72f5000ce5c8e3fe2309126046d281e.tar.gz
glib-2.0-native: upgrade to 2.14.5
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3476 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/glib-2.0')
-rw-r--r--meta/packages/glib-2.0/glib-2.0-native-2.14.5/configure-libtool.patch29
-rw-r--r--meta/packages/glib-2.0/glib-2.0-native-2.14.5/glib-gettextize-dir.patch (renamed from meta/packages/glib-2.0/glib-2.0-native-2.12.13/glib-gettextize-dir.patch)0
-rw-r--r--meta/packages/glib-2.0/glib-2.0-native_2.14.5.bb (renamed from meta/packages/glib-2.0/glib-2.0-native_2.12.13.bb)1
3 files changed, 30 insertions, 0 deletions
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 @@
1--- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100
2+++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100
3@@ -1174,7 +1174,7 @@
4 G_MODULE_LDFLAGS=
5 else
6 export SED
7- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
8+ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
9 fi
10 dnl G_MODULE_IMPL= don't reset, so cmd-line can override
11 G_MODULE_NEED_USCORE=0
12@@ -1265,7 +1265,7 @@
13 LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
14 dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
15 echo "void glib_plugin_test(void) { }" > plugin.c
16- ${SHELL} ./libtool --mode=compile ${CC} -shared \
17+ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \
18 -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
19 AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
20 glib_cv_rtldglobal_broken,[
21@@ -1339,7 +1339,7 @@
22
23 AC_MSG_CHECKING(for the suffix of shared libraries)
24 export SED
25-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
26+shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='`
27 eval $shrext_cmds
28 module=yes eval std_shrext=$shrext_cmds
29 # 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"
11 11
12SRC_URI = "http://download.gnome.org/sources/glib/2.12/glib-${PV}.tar.bz2 \ 12SRC_URI = "http://download.gnome.org/sources/glib/2.12/glib-${PV}.tar.bz2 \
13 file://glib-gettextize-dir.patch;patch=1 \ 13 file://glib-gettextize-dir.patch;patch=1 \
14 file://configure-libtool.patch;patch=1 \
14 file://glibconfig-sysdefs.h" 15 file://glibconfig-sysdefs.h"
15 16
16S = "${WORKDIR}/glib-${PV}" 17S = "${WORKDIR}/glib-${PV}"