diff options
| author |   Ross Burton <ross@openedhand.com> | 2007-08-01 15:37:33 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2007-08-01 15:37:33 +0000 |
| commit | 6f85f7978e1e9fc84fca0db9dc46254f7f1d418a (patch) | |
| tree | 8f683d3661a1097199580bfac5fc1fc4e5a60b6e | |
| parent | 32dde8e8c031352f65503ed890b7f692540795a7 (diff) | |
| download | openembedded-core-contrib-6f85f7978e1e9fc84fca0db9dc46254f7f1d418a.tar.gz | |
Upgrade bleeding to glib 2.13.7
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2295 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/conf/distro/poky-bleeding.conf | 2 | ||||
| -rw-r--r-- | meta/packages/glib-2.0/glib-2.0-2.13.7/configure-libtool.patch | 29 | ||||
| -rw-r--r-- | meta/packages/glib-2.0/glib-2.0_2.13.7.bb | 6 |
3 files changed, 36 insertions, 1 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf index 0153674833..ea574f8bae 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.13" +PREFERRED_VERSION_glib-2.0 ?= "2.13.7" PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" PREFERRED_VERSION_cairo ?= "1.4.8" diff --git a/meta/packages/glib-2.0/glib-2.0-2.13.7/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.13.7/configure-libtool.patch new file mode 100644 index 0000000000..a52327c8c9 --- /dev/null +++ b/meta/packages/glib-2.0/glib-2.0-2.13.7/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_2.13.7.bb b/meta/packages/glib-2.0/glib-2.0_2.13.7.bb new file mode 100644 index 0000000000..be296be20c --- /dev/null +++ b/meta/packages/glib-2.0/glib-2.0_2.13.7.bb @@ -0,0 +1,6 @@ +require glib.inc + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.13/glib-${PV}.tar.bz2 \ + file://glibconfig-sysdefs.h \ + file://configure-libtool.patch;patch=1" + |