From 78d64f285a3b3b6c2eb8b21e8025d7c860cfc6bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <remi@godotengine.org>
Date: Wed, 24 Mar 2021 12:07:27 +0100
Subject: [PATCH] macOS: Disable LDID fake signing for arm64

It doesn't work and makes it impossible to sign binaries properly
without using --force.
---
 build-macosx/build.sh | 4 +++-
 build.sh              | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build-macosx/build.sh b/build-macosx/build.sh
index e75a59a..e15bb18 100755
--- a/build-macosx/build.sh
+++ b/build-macosx/build.sh
@@ -8,7 +8,9 @@ export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
 export OPTIONS="osxcross_sdk=darwin20 production=yes"
 export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes mono_prefix=/root/dependencies/mono"
 export TERM=xterm
-export STRIP="x86_64-apple-${osxcross_sdk}-strip -u -r"
+export STRIP="x86_64-apple-darwin20-strip -u -r"
+# Disable fake-signing of arm binaries.
+export NO_LDID=1
 
 rm -rf godot
 mkdir godot
diff --git a/build.sh b/build.sh
index 7a11df7..bfd9705 100755
--- a/build.sh
+++ b/build.sh
@@ -146,7 +146,7 @@ if [ "${skip_git_checkout}" == 0 ]; then
   # Validate version
   correct_version=$(python3 << EOF
 import version;
-if hasattr(version, "patch"):
+if hasattr(version, "patch") and version.patch != 0:
   git_version = f"{version.major}.{version.minor}.{version.patch}-{version.status}"
 else:
   git_version = f"{version.major}.{version.minor}-{version.status}"