Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame^] | 1 | From 0ecaa5bab162abf0cb2057d77beeb7b89d5873b4 Mon Sep 17 00:00:00 2001 |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 3 | Date: Tue, 21 Jun 2016 14:53:56 +0300 |
| 4 | Subject: [PATCH 1/4] Hardcoded libtool |
| 5 | |
| 6 | Upstream-Status: Inappropriate [embedded specific] |
| 7 | |
| 8 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> |
| 9 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 10 | --- |
| 11 | configure.ac | 6 +++--- |
| 12 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 13 | |
| 14 | diff --git a/configure.ac b/configure.ac |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame^] | 15 | index 6628e21..f43ac09 100644 |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 16 | --- a/configure.ac |
| 17 | +++ b/configure.ac |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame^] | 18 | @@ -617,7 +617,7 @@ AC_MSG_CHECKING([whether to write dependencies into .pc files]) |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 19 | case $enable_explicit_deps in |
| 20 | auto) |
| 21 | export SED |
| 22 | - deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` |
| 23 | + deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` |
| 24 | if test "x$deplibs_check_method" != xpass_all || test "x$enable_static" = xyes ; then |
| 25 | enable_explicit_deps=yes |
| 26 | else |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame^] | 27 | @@ -895,7 +895,7 @@ else |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 28 | dnl Now we check to see if our libtool supports shared lib deps |
| 29 | dnl (in a rather ugly way even) |
| 30 | if $dynworks; then |
| 31 | - module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" |
| 32 | + module_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config" |
| 33 | module_deplibs_check=`$module_libtool_config | \ |
| 34 | grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ |
| 35 | sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame^] | 36 | @@ -1649,7 +1649,7 @@ AC_SUBST(GTK_PRINT_BACKENDS) |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 37 | # We are using gmodule-no-export now, but I'm leaving the stripping |
| 38 | # code in place for now, since pango and atk still require gmodule. |
| 39 | export SED |
| 40 | -export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` |
| 41 | +export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` |
| 42 | if test -n "$export_dynamic"; then |
| 43 | GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` |
| 44 | GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` |
| 45 | -- |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame^] | 46 | 2.12.0 |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 47 | |