diff options
| author |   Richard Purdie <richard@openedhand.com> | 2008-04-14 11:53:00 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-04-14 11:53:00 +0000 |
| commit | 00f2aa5a90d9c8b283689529fd3788eae2a84a3a (patch) | |
| tree | 3f029c8c9d622abaffd6fd6956cd3fcb4788389a | |
| parent | d12aa66245d694ff26676294fd19b5d69cb10f50 (diff) | |
| download | openembedded-core-00f2aa5a90d9c8b283689529fd3788eae2a84a3a.tar.gz | |
glib-2.0: Update patch to work with libtool 2.2.2
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4247 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/glib-2.0/glib-2.0-2.16.3/configure-libtool.patch | 11 | ||||
| -rw-r--r-- | meta/packages/glib-2.0/glib-2.0-native_2.16.3.bb | 2 | ||||
| -rw-r--r-- | meta/packages/glib-2.0/glib-2.0_2.16.3.bb | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/meta/packages/glib-2.0/glib-2.0-2.16.3/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.16.3/configure-libtool.patch index a52327c8c9..3ba79b8986 100644 --- a/meta/packages/glib-2.0/glib-2.0-2.16.3/configure-libtool.patch +++ b/meta/packages/glib-2.0/glib-2.0-2.16.3/configure-libtool.patch @@ -1,3 +1,8 @@ +# Poky renames libtool to $host_alias-libtool. +# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2 +# so we can't call # it at this point. We can safely assume a version is available +# from PATH though + --- 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 @@ @@ -5,7 +10,7 @@ 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` ++ 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 @@ -14,7 +19,7 @@ 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 \ ++ ${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,[ @@ -23,7 +28,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='` ++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.16.3.bb b/meta/packages/glib-2.0/glib-2.0-native_2.16.3.bb index b26480dd01..1f80eb1a18 100644 --- a/meta/packages/glib-2.0/glib-2.0-native_2.16.3.bb +++ b/meta/packages/glib-2.0/glib-2.0-native_2.16.3.bb @@ -7,7 +7,7 @@ LICENSE = "LGPL" SECTION = "libs" PRIORITY = "optional" DEPENDS += "gtk-doc-native" -PR="r2" +PR = "r3" SRC_URI = "http://download.gnome.org/sources/glib/2.16/glib-${PV}.tar.bz2 \ file://glib-gettextize-dir.patch;patch=1 \ diff --git a/meta/packages/glib-2.0/glib-2.0_2.16.3.bb b/meta/packages/glib-2.0/glib-2.0_2.16.3.bb index 7ac48e14ff..0a009e6da2 100644 --- a/meta/packages/glib-2.0/glib-2.0_2.16.3.bb +++ b/meta/packages/glib-2.0/glib-2.0_2.16.3.bb @@ -1,6 +1,6 @@ require glib.inc -PR = "r1" +PR = "r2" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ |