diff --git a/patches/configure-Crosscompiling/0001-configure.ac-Search-for-otool-using-AC_CHECK_TOOL.patch b/patches/configure-Crosscompiling/0001-configure.ac-Search-for-otool-using-AC_CHECK_TOOL.patch index 8ef75c06..68c98ba1 100644 --- a/patches/configure-Crosscompiling/0001-configure.ac-Search-for-otool-using-AC_CHECK_TOOL.patch +++ b/patches/configure-Crosscompiling/0001-configure.ac-Search-for-otool-using-AC_CHECK_TOOL.patch @@ -1,39 +1,34 @@ -From 463cba8291e1dba1f381e0930926bc0c4bc26916 Mon Sep 17 00:00:00 2001 +From c6b2b1df5a754ac292ee66d091d7892e8252c5c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 21 Jun 2015 20:00:18 +0200 -Subject: configure.ac: Search for otool using AC_CHECK_TOOL. +Subject: configure.ac: Search for otool using AC_CHECK_TOOL. (v2) This is necessary to allow using otool from custom host toolchains like i686-apple-darwin12-otool. --- - aclocal.m4 | 2 +- - configure.ac | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) + aclocal.m4 | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aclocal.m4 b/aclocal.m4 -index 3d43721..9993de1 100644 +index 3d43721..f7a12f1 100644 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -62,7 +62,7 @@ LIBS="-l$1 $5 $LIBS" +@@ -42,6 +42,7 @@ dnl Usage: WINE_PATH_PKG_CONFIG + dnl + AC_DEFUN([WINE_PATH_SONAME_TOOLS], + [AC_PATH_PROG(LDD,ldd,true,/sbin:/usr/sbin:$PATH) ++AC_CHECK_TOOL(OTOOL,otool,otool) + AC_CHECK_TOOL(READELF,[readelf],true)]) + + AC_DEFUN([WINE_PATH_PKG_CONFIG], +@@ -62,7 +63,7 @@ LIBS="-l$1 $5 $LIBS" AC_LINK_IFELSE([AC_LANG_CALL([], [$2])], [case "$LIBEXT" in dll) AS_VAR_SET(ac_Lib,[`$ac_cv_path_LDD conftest.exe | grep "$1" | sed -e "s/dll.*/dll/"';2,$d'`]) ;; - dylib) AS_VAR_SET(ac_Lib,[`otool -L conftest$ac_exeext | grep "ac_lib_pattern\\.[[0-9A-Za-z.]]*dylib" | sed -e "s/^.*\/\(ac_lib_pattern\.[[0-9A-Za-z.]]*dylib\).*$/\1/"';2,$d'`]) ;; -+ dylib) AS_VAR_SET(ac_Lib,[`$ac_cv_prog_OTOOL -L conftest$ac_exeext | grep "ac_lib_pattern\\.[[0-9A-Za-z.]]*dylib" | sed -e "s/^.*\/\(ac_lib_pattern\.[[0-9A-Za-z.]]*dylib\).*$/\1/"';2,$d'`]) ;; ++ dylib) AS_VAR_SET(ac_Lib,[`$OTOOL -L conftest$ac_exeext | grep "ac_lib_pattern\\.[[0-9A-Za-z.]]*dylib" | sed -e "s/^.*\/\(ac_lib_pattern\.[[0-9A-Za-z.]]*dylib\).*$/\1/"';2,$d'`]) ;; *) AS_VAR_SET(ac_Lib,[`$READELF -d conftest$ac_exeext | grep "NEEDED.*ac_lib_pattern\\.$LIBEXT" | sed -e "s/^.*\\m4_dquote(\\(ac_lib_pattern\\.$LIBEXT[[^ ]]*\\)\\).*$/\1/"';2,$d'`]) AS_VAR_IF([ac_Lib],[], [AS_VAR_SET(ac_Lib,[`$LDD conftest$ac_exeext | grep "ac_lib_pattern\\.$LIBEXT" | sed -e "s/^.*\(ac_lib_pattern\.$LIBEXT[[^ ]]*\).*$/\1/"';2,$d'`])]) ;; -diff --git a/configure.ac b/configure.ac -index f9df3f0..3587a12 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -268,6 +268,7 @@ fi - - AC_CHECK_TOOLS(AR,[ar gar],ar) - AC_CHECK_TOOL(STRIP,strip,strip) -+AC_CHECK_TOOL(OTOOL,otool,otool) - AC_SUBST(ARFLAGS,rc) - AC_PROG_RANLIB - AC_PROG_LN_S -- -2.4.3 +2.4.4 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index d9ed0ffd..e957e2af 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -2124,7 +2124,7 @@ if test "$enable_configure_Crosscompiling" -eq 1; then patch_apply configure-Crosscompiling/0001-configure.ac-Search-for-otool-using-AC_CHECK_TOOL.patch patch_apply configure-Crosscompiling/0002-configure.ac-Remove-check-for-strength-reduce-bug.patch ( - echo '+ { "Michael Müller", "configure.ac: Search for otool using AC_CHECK_TOOL.", 1 },'; + echo '+ { "Michael Müller", "configure.ac: Search for otool using AC_CHECK_TOOL.", 2 },'; echo '+ { "Michael Müller", "configure.ac: Remove check for strength-reduce bug.", 1 },'; ) >> "$patchlist" fi