summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-03-07 19:16:22 +0000
committerRoss Burton <ross@openedhand.com>2007-03-07 19:16:22 +0000
commitf39c891bb648b6be7de8bc8b0c4345a073742656 (patch)
treef4fa89e0661d7e87ed39a0cccff8ae3148ab12b8
parent3f21c02f909d9ea42c8c138cf76548db0ab397b0 (diff)
downloadpoky-f39c891bb648b6be7de8bc8b0c4345a073742656.tar.gz
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
-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 9aaa7e4f03..93c5b54ef2 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -1,4 +1,4 @@
1PREFERRED_VERSION_glib-2.0 ?= "2.12.6" 1PREFERRED_VERSION_glib-2.0 ?= "2.12.10"
2PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" 2PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
3 3
4PREFERRED_VERSION_cairo ?= "1.4.0" 4PREFERRED_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 @@
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
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 4d8e59b355..4d8e59b355 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