diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-13 15:47:59 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-13 16:17:06 +0000 |
| commit | aa45f90162e1c95ecf0940bea148426488457c50 (patch) | |
| tree | 7654c866226e34d0436b1ae956a221769bd708ba /meta/recipes-core/glib-2.0 | |
| parent | b939ff53ed46773eb910f66565d5c4d16bb23d5a (diff) | |
| download | openembedded-core-contrib-aa45f90162e1c95ecf0940bea148426488457c50.tar.gz | |
glib-2.0: Fix path problems with libtool 2.4
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0')
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0-2.27.5/configure-libtool.patch | 6 | ||||
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-2.27.5/configure-libtool.patch b/meta/recipes-core/glib-2.0/glib-2.0-2.27.5/configure-libtool.patch index a5dd4f249e..7c170be60f 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0-2.27.5/configure-libtool.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0-2.27.5/configure-libtool.patch @@ -12,7 +12,7 @@ diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac 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 @@ -21,7 +21,7 @@ diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac 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,[ @@ -30,7 +30,7 @@ diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac AC_MSG_CHECKING(for the suffix of module 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/recipes-core/glib-2.0/glib-2.0_2.27.5.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb index 171c8fe651..314d9429e3 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb @@ -1,6 +1,6 @@ require glib.inc -PR = "r1" +PR = "r2" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.27/glib-${PV}.tar.bz2 \ file://configure-libtool.patch \ |