diff options
Diffstat (limited to 'meta/packages/glib-2.0/glib-2.0-2.16.3/configure-libtool.patch')
| -rw-r--r-- | meta/packages/glib-2.0/glib-2.0-2.16.3/configure-libtool.patch | 11 |
1 files changed, 8 insertions, 3 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 @@ | |||
| 1 | # Poky renames libtool to $host_alias-libtool. | ||
| 2 | # ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2 | ||
| 3 | # so we can't call # it at this point. We can safely assume a version is available | ||
| 4 | # from PATH though | ||
| 5 | |||
| 1 | --- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100 | 6 | --- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100 |
| 2 | +++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100 | 7 | +++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100 |
| 3 | @@ -1174,7 +1174,7 @@ | 8 | @@ -1174,7 +1174,7 @@ |
| @@ -5,7 +10,7 @@ | |||
| 5 | else | 10 | else |
| 6 | export SED | 11 | export SED |
| 7 | - G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | 12 | - G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` |
| 8 | + G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | 13 | + G_MODULE_LDFLAGS=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` |
| 9 | fi | 14 | fi |
| 10 | dnl G_MODULE_IMPL= don't reset, so cmd-line can override | 15 | dnl G_MODULE_IMPL= don't reset, so cmd-line can override |
| 11 | G_MODULE_NEED_USCORE=0 | 16 | G_MODULE_NEED_USCORE=0 |
| @@ -14,7 +19,7 @@ | |||
| 14 | dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness | 19 | dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness |
| 15 | echo "void glib_plugin_test(void) { }" > plugin.c | 20 | echo "void glib_plugin_test(void) { }" > plugin.c |
| 16 | - ${SHELL} ./libtool --mode=compile ${CC} -shared \ | 21 | - ${SHELL} ./libtool --mode=compile ${CC} -shared \ |
| 17 | + ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \ | 22 | + ${SHELL} $host_alias-libtool --mode=compile ${CC} -shared \ |
| 18 | -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null | 23 | -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null |
| 19 | AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], | 24 | AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], |
| 20 | glib_cv_rtldglobal_broken,[ | 25 | glib_cv_rtldglobal_broken,[ |
| @@ -23,7 +28,7 @@ | |||
| 23 | AC_MSG_CHECKING(for the suffix of shared libraries) | 28 | AC_MSG_CHECKING(for the suffix of shared libraries) |
| 24 | export SED | 29 | export SED |
| 25 | -shrext_cmds=`./libtool --config | grep '^shrext_cmds='` | 30 | -shrext_cmds=`./libtool --config | grep '^shrext_cmds='` |
| 26 | +shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='` | 31 | +shrext_cmds=`$host_alias-libtool --config | grep '^shrext_cmds='` |
| 27 | eval $shrext_cmds | 32 | eval $shrext_cmds |
| 28 | module=yes eval std_shrext=$shrext_cmds | 33 | module=yes eval std_shrext=$shrext_cmds |
| 29 | # chop the initial dot | 34 | # chop the initial dot |