From 9077967178d5989767483a6afe97b732aa433889 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Mon, 28 Sep 2020 12:52:10 +0000
Subject: carla: invoke the correct mingw compiler on 32bit; some syntax fixes
 in the SlackBuild script

---
 carla/build/carla.SlackBuild | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'carla')

diff --git a/carla/build/carla.SlackBuild b/carla/build/carla.SlackBuild
index 14bf62d4..ab5fd26d 100755
--- a/carla/build/carla.SlackBuild
+++ b/carla/build/carla.SlackBuild
@@ -52,7 +52,15 @@ TAG=${TAG:-alien}
 
 DOCS="INSTALL.md README.md doc/*"
 
-if which i686-w64-mingw32-gcc 2>/dev/null && which winegcc 2>/dev/null ; then
+# Determine whether we have the tools to compile the Windows VST support:
+if [ "$ARCH" == "x86_64" ]; then
+  WIN_COMPILERS="x86_64-w64-mingw32-gcc i686-w64-mingw32-gcc winegcc"
+  WIN32_ARCH="i686"
+else
+  WIN_COMPILERS="i586-w64-mingw32-gcc winegcc"
+  WIN32_ARCH="i586"
+fi
+if which ${WIN_COMPILERS} 2>/dev/null ; then
   BUILD_WINVST="YES"
 else
   BUILD_WINVST="NO"
@@ -197,22 +205,24 @@ if [ "$BUILD_WINVST" == "YES" ]; then
     # The Windows bridges (using MinGW-w64):
     echo "-- compile carla windows bridges 64bit --"
     CFLAGS="" CPPFLAGS="" CXXFLAGS="" LDFLAGS="" \
-      make $NUMJOBS win64 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++
-        2>&1 | tee $OUTPUT/make-${PRGNAM}_bridges64.log
+    make $NUMJOBS win64 \
+      CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ \
+      2>&1 | tee $OUTPUT/make-${PRGNAM}_bridges64.log
     # The native <-> wine bridges (using Wine):
     echo "-- compile carla native <-> wine bridges 64bit --"
-    make $NUMJOBS wine64
+    make $NUMJOBS wine64 \
       2>&1 | tee $OUTPUT/make-${PRGNAM}_wine64.log
   fi
   # We always compile the 32bit binaries (64bit OS needs multilib of course):
   # The Windows bridges (using MinGW-w64):
   echo "-- compile carla windows bridges 32bit --"
   CFLAGS="" CPPFLAGS="" CXXFLAGS="" LDFLAGS="" \
-    make $NUMJOBS win32 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++
-      2>&1 | tee $OUTPUT/make-${PRGNAM}_bridges32.log
+  make $NUMJOBS win32 \
+    CC=${WIN32_ARCH}-w64-mingw32-gcc CXX=${WIN32_ARCH}-w64-mingw32-g++ \
+    2>&1 | tee $OUTPUT/make-${PRGNAM}_bridges32.log
   # The native <-> wine bridges (using Wine):
   echo "-- compile carla native <-> wine bridges 32bit --"
-  make $NUMJOBS wine32
+  make $NUMJOBS wine32 \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_wine32.log
 fi
 
-- 
cgit v1.2.3-65-gdbad