wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against a8f45dff604058d419bd6c2e070f65a13a6ddfdb.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-07-14 21:59:32 +02:00
parent a8303d406b
commit 9f011de1b5
15 changed files with 45 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
patches/configure-Crosscompiling/0002-configure.ac-Remove-check-for-strength-reduce-bug.patch → patches/configure-Crosscompiling/0001-configure.ac-Remove-check-for-strength-reduce-bug.patch
View File

34
patches/configure-Crosscompiling/0001-configure.ac-Search-for-otool-using-AC_CHECK_TOOL.patch
View File

@@ -1,34 +0,0 @@
From c6b2b1df5a754ac292ee66d091d7892e8252c5c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 21 Jun 2015 20:00:18 +0200
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 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 3d43721..f7a12f1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -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,[`$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'`])]) ;;
--
2.4.4