Build scripts update for ARMv8

Author: FrodeSolheim

dist/linux/build.py

@@ -14,17 +14,7 @@
             pass
 
 version = package["PACKAGE_VERSION"]
-
-p = subprocess.Popen(["file", "-L", "/bin/sh"], stdout=subprocess.PIPE)
-exe_info = p.stdout.read().decode("UTF-8")
-if "386" in exe_info:
-    arch = "x86"
-elif "x86-64" in exe_info:
-    arch = "x86-64"
-elif "ARM" in exe_info and "armhf" in exe_info:
-    arch = "ARMv8"
-else:
-    raise Exception("unrecognized arch " + repr(exe_info))
+arch = os.environ["SYSTEM_ARCH"]
 
 # if os.environ.get("STEAMOS", ""):
 #     os_name = "steamos"

fsbuild/bundle.sh

@@ -1,4 +1,5 @@
 . ./PACKAGE.FS
+. fsbuild/system.sh
 
 cd fsbuild
 rm -Rf _build
@@ -7,7 +8,7 @@ cd ..
 
 if [ "`uname`" = "Linux" ]; then
 cd dist/linux
-BUILD=0 PACKAGE=0 make
+BUILD=0 PACKAGE=0 SYSTEM_ARCH="$SYSTEM_ARCH" make
 mv FS-UAE ../../fsbuild/_build
 cd ../..
 elif [ "`uname`" = "Darwin" ]; then

fsbuild/clean

@@ -3,7 +3,7 @@
 
 set -e
 
-rm -Rf fsbuild/_*
+rm -Rf fsbuild/_[a-z]*
 
 if [ -f fsbuild/clean.sh ]; then
 . fsbuild/clean.sh

fsbuild/system.sh

@@ -9,9 +9,10 @@ case "`uname`" in
 esac
 
 case "`uname -m`" in
-    x86_64*) SYSTEM_ARCH=x86-64;;
-    arm64*)  SYSTEM_ARCH=ARM64;;
-    *)       SYSTEM_ARCH=Unknown;;
+    x86_64*)  SYSTEM_ARCH=x86-64;;
+    arm64*)   SYSTEM_ARCH=ARM64;;
+    armv7l*)  SYSTEM_ARCH=ARM;;
+    *)        SYSTEM_ARCH=Unknown;;
 esac
 
 if [ $SYSTEM_OS = "Windows" ]; then
@@ -25,6 +26,10 @@ fi
 # FIXME: Deprecated alias
 SYSTEM=$SYSTEM_OS
 
+if [ "$FSBUILD_ARCH" != "" ]; then
+SYSTEM_ARCH=$FSBUILD_ARCH
+fi
+
 if [ "$SYSTEM_OS_DIST" = "" ]; then
 SYSTEM_OS_DIST=$SYSTEM_OS
 fi

fsbuild/version.py

@@ -259,7 +259,7 @@ def calculate_version(
             if githubRef.startswith("refs/pull/"):
                 branch = "pull" + githubRef[len("refs/pull/"):].replace("/", "")
         if not branch:
-            branch = subprocess.check_output(["git", "branch", "--show-current"], encoding="UTF-8").strip()
+            branch = subprocess.check_output(["git", "symbolic-ref", "--short", "HEAD"], encoding="UTF-8").strip()
 
         if branch == "stable":
             version.tag = ""

fsdeps/dep/SDL2

@@ -54,6 +54,7 @@ if [ "`uname`" = "Linux" ]; then
 ./configure \
     --prefix=$PREFIX \
     --disable-sndio \
+    --disable-video-rpi \
     --enable-video-wayland \
     --enable-video-kmsdrm
 else

fsdeps/system.sh

@@ -9,9 +9,10 @@ case "`uname`" in
 esac
 
 case "`uname -m`" in
-    x86_64*) SYSTEM_ARCH=x86-64;;
-    arm64*)  SYSTEM_ARCH=ARM64;;
-    *)       SYSTEM_ARCH=Unknown;;
+    x86_64*)  SYSTEM_ARCH=x86-64;;
+    arm64*)   SYSTEM_ARCH=ARM64;;
+    armv7l*)  SYSTEM_ARCH=ARM;;
+    *)        SYSTEM_ARCH=Unknown;;
 esac
 
 # FIXME: Deprecated alias

src/fsuae/fsuae-main.c

@@ -1437,10 +1437,14 @@ static const char *overlay_names[] = {
 #define ARCH_NAME_2 "x86"
 #elif defined(__ppc__)
 #define ARCH_NAME_2 "PPC"
+#elif defined(__aarch64__)
+#define ARCH_NAME_2 "ARM64"
+#elif defined(__ARM_ARCH_8A__)
+#define ARCH_NAME_2 "ARMv8"
 #elif defined(__arm__)
 #define ARCH_NAME_2 "ARM"
 #else
-#define ARCH_NAME_2 "?"
+#define ARCH_NAME_2 "Unknown"
 #endif
 
 // clang-format off

src/fsuae/fsuae-plugins.c

@@ -27,8 +27,10 @@
 #define ARCH_NAME "PPC"
 #elif defined(__aarch64__)
 #define ARCH_NAME "ARM64"
+#elif defined(__ARM_ARCH_8A__)
+#define ARCH_NAME "ARMv8"
 #elif defined(__arm__)
-#define ARCH_NAME "ARM32"
+#define ARCH_NAME "ARM"
 #else
 #define ARCH_NAME "unknown"
 #endif