summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-13 15:47:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-13 16:17:06 +0000
commitaa45f90162e1c95ecf0940bea148426488457c50 (patch)
tree7654c866226e34d0436b1ae956a221769bd708ba /meta/recipes-core
parentb939ff53ed46773eb910f66565d5c4d16bb23d5a (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0-2.27.5/configure-libtool.patch6
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb2
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
12 else 12 else
13 export SED 13 export SED
14- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` 14- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
15+ G_MODULE_LDFLAGS=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` 15+ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
16 fi 16 fi
17 dnl G_MODULE_IMPL= don't reset, so cmd-line can override 17 dnl G_MODULE_IMPL= don't reset, so cmd-line can override
18 G_MODULE_NEED_USCORE=0 18 G_MODULE_NEED_USCORE=0
@@ -21,7 +21,7 @@ diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac
21 dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness 21 dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
22 echo "void glib_plugin_test(void) { }" > plugin.c 22 echo "void glib_plugin_test(void) { }" > plugin.c
23- ${SHELL} ./libtool --mode=compile ${CC} -shared \ 23- ${SHELL} ./libtool --mode=compile ${CC} -shared \
24+ ${SHELL} $host_alias-libtool --mode=compile ${CC} -shared \ 24+ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \
25 -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null 25 -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
26 AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], 26 AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
27 glib_cv_rtldglobal_broken,[ 27 glib_cv_rtldglobal_broken,[
@@ -30,7 +30,7 @@ diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac
30 AC_MSG_CHECKING(for the suffix of module shared libraries) 30 AC_MSG_CHECKING(for the suffix of module shared libraries)
31 export SED 31 export SED
32-shrext_cmds=`./libtool --config | grep '^shrext_cmds='` 32-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
33+shrext_cmds=`$host_alias-libtool --config | grep '^shrext_cmds='` 33+shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='`
34 eval $shrext_cmds 34 eval $shrext_cmds
35 module=yes eval std_shrext=$shrext_cmds 35 module=yes eval std_shrext=$shrext_cmds
36 # chop the initial dot 36 # 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 @@
1require glib.inc 1require glib.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.27/glib-${PV}.tar.bz2 \ 5SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.27/glib-${PV}.tar.bz2 \
6 file://configure-libtool.patch \ 6 file://configure-libtool.patch \