diff --git a/patches/configure-Crosscompiling/0001-configure.ac-Fix-cross-compiling-of-32-bit-Wine-for-.patch b/patches/configure-Crosscompiling/0001-configure.ac-Fix-cross-compiling-of-32-bit-Wine-for-.patch new file mode 100644 index 00000000..c211dd47 --- /dev/null +++ b/patches/configure-Crosscompiling/0001-configure.ac-Fix-cross-compiling-of-32-bit-Wine-for-.patch @@ -0,0 +1,30 @@ +From 4b55f147ef88c192985081fc5a023de2b198cfb1 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +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 + diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index c77e16be..d0e9dc03 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -101,6 +101,7 @@ 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" @@ -464,6 +465,9 @@ patch_enable () configure-Absolute_RPATH) enable_configure_Absolute_RPATH="$2" ;; + configure-Crosscompiling) + enable_configure_Crosscompiling="$2" + ;; crypt32-CMS_Certificates) enable_crypt32_CMS_Certificates="$2" ;; @@ -2864,6 +2868,18 @@ 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: