From a14d61f7d38c3ae36f45a93878b0642e59f13009 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 26 Nov 2007 10:15:23 +0000 Subject: glib-2.0: upgrade to 2.14.4 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3240 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/distro/poky.conf | 2 +- .../glib-2.0-2.14.3/configure-libtool.patch | 29 ---------------------- .../glib-2.0-2.14.4/configure-libtool.patch | 29 ++++++++++++++++++++++ meta/packages/glib-2.0/glib-2.0_2.14.3.bb | 5 ---- meta/packages/glib-2.0/glib-2.0_2.14.4.bb | 5 ++++ 5 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 meta/packages/glib-2.0/glib-2.0-2.14.3/configure-libtool.patch create mode 100644 meta/packages/glib-2.0/glib-2.0-2.14.4/configure-libtool.patch delete mode 100644 meta/packages/glib-2.0/glib-2.0_2.14.3.bb create mode 100644 meta/packages/glib-2.0/glib-2.0_2.14.4.bb diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index f288277702..a6ab5cf939 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -190,7 +190,7 @@ PREFERRED_VERSION_gtk-sato-engine ?= "0.1" PREFERRED_VERSION_matchbox-theme-sato ?= "0.1" PREFERRED_VERSION_sato-icon-theme ?= "0.1" -PREFERRED_VERSION_glib-2.0 ?= "2.14.3" +PREFERRED_VERSION_glib-2.0 ?= "2.14.4" PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" PREFERRED_VERSION_atk ?= "1.18.0" PREFERRED_VERSION_cairo ?= "1.4.10" diff --git a/meta/packages/glib-2.0/glib-2.0-2.14.3/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.14.3/configure-libtool.patch deleted file mode 100644 index a52327c8c9..0000000000 --- a/meta/packages/glib-2.0/glib-2.0-2.14.3/configure-libtool.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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.14.4/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.14.4/configure-libtool.patch new file mode 100644 index 0000000000..a52327c8c9 --- /dev/null +++ b/meta/packages/glib-2.0/glib-2.0-2.14.4/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.14.3.bb b/meta/packages/glib-2.0/glib-2.0_2.14.3.bb deleted file mode 100644 index 995efbd119..0000000000 --- a/meta/packages/glib-2.0/glib-2.0_2.14.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require glib.inc - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${PV}.tar.bz2 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1" diff --git a/meta/packages/glib-2.0/glib-2.0_2.14.4.bb b/meta/packages/glib-2.0/glib-2.0_2.14.4.bb new file mode 100644 index 0000000000..995efbd119 --- /dev/null +++ b/meta/packages/glib-2.0/glib-2.0_2.14.4.bb @@ -0,0 +1,5 @@ +require glib.inc + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${PV}.tar.bz2 \ + file://glibconfig-sysdefs.h \ + file://configure-libtool.patch;patch=1" -- cgit v1.2.3