Removed patch to fix cross-compilation of 32-bit Wine on OSX.

On Clang 3.5 passing "-m32" implicitly enabled SSE2 support. In newer versions
of Clang this issue was fixed, so the patch has no effect anymore, and a
different solution is required to fix various build failures related to SSE2
support. Ideally Wine should automatically set it when compiling such
components, but for now we pass CFLAGS="-msse2" in the build scripts to work
around this bug.

In addition, there are several bugs in the cctools-port crosscompiling
toolchain - at several places host architecture and target architecture are
mixed up, leading to build failures when the toolchain was built for a 64-bit
host system and trying to compile for a 32-bit target. For our build servers,
we now apply patches to fix those issues properly. A quick&dirty workaround
would be to keep the CFLAGS="-m32".
This commit is contained in:
Sebastian Lackner 2016-04-07 05:38:05 +02:00
parent 7ffe842cc0
commit e8ef34b3a1
2 changed files with 0 additions and 46 deletions

View File

@ -1,30 +0,0 @@
From 4b55f147ef88c192985081fc5a023de2b198cfb1 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 7 Mar 2016 02:40:56 +0100
Subject: configure.ac: Fix cross-compiling of 32-bit Wine for OSX.
---
configure.ac | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/configure.ac b/configure.ac
index b57ff6a..fd65810 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,6 +175,13 @@ case $host in
AC_SUBST(TARGETFLAGS,"-marm")
;;
i[[3456789]]86*)
+ if test "$cross_compiling" = "yes"; then
+ CC="$CC -m32"
+ CXX="$CXX -m32"
+ host_cpu="i386"
+ notice_platform="32-bit "
+ AC_SUBST(TARGETFLAGS,"-m32")
+ fi
enable_win16=${enable_win16:-yes}
;;
esac
--
2.7.1

View File

@ -99,7 +99,6 @@ patch_enable_all ()
enable_comctl32_TTM_ADDTOOLW="$1"
enable_compobj_dll16_StringFromGUID2="$1"
enable_configure_Absolute_RPATH="$1"
enable_configure_Crosscompiling="$1"
enable_crypt32_CMS_Certificates="$1"
enable_crypt32_CryptUnprotectMemory="$1"
enable_d3d9_DesktopWindow="$1"
@ -475,9 +474,6 @@ patch_enable ()
configure-Absolute_RPATH)
enable_configure_Absolute_RPATH="$2"
;;
configure-Crosscompiling)
enable_configure_Crosscompiling="$2"
;;
crypt32-CMS_Certificates)
enable_crypt32_CMS_Certificates="$2"
;;
@ -2870,18 +2866,6 @@ if test "$enable_configure_Absolute_RPATH" -eq 1; then
) >> "$patchlist"
fi
# Patchset configure-Crosscompiling
# |
# | Modified files:
# | * configure.ac
# |
if test "$enable_configure_Crosscompiling" -eq 1; then
patch_apply configure-Crosscompiling/0001-configure.ac-Fix-cross-compiling-of-32-bit-Wine-for-.patch
(
echo '+ { "Sebastian Lackner", "configure.ac: Fix cross-compiling of 32-bit Wine for OSX.", 1 },';
) >> "$patchlist"
fi
# Patchset crypt32-CMS_Certificates
# |
# | This patchset fixes the following Wine bugs: