From 81afdecd30044a84c9fb1a0e84ff0dc40cff7a70 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Fri, 13 Nov 2015 17:36:19 -0600
Subject: linux installer tweak:

check architecture before gcc4/5 compat
---
 tools/linux_packaging/stage2.run.in | 76 ++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

(limited to 'tools/linux_packaging')

diff --git a/tools/linux_packaging/stage2.run.in b/tools/linux_packaging/stage2.run.in
index 4b6cb728af..ea83a57e20 100755
--- a/tools/linux_packaging/stage2.run.in
+++ b/tools/linux_packaging/stage2.run.in
@@ -229,42 +229,6 @@ case `uname -m` in
 		;;
 esac
 
-#############################
-# Determine C11 stdlibc++ ABI
-#############################
-
-if %REPLACE_GCC5%; then
-	# Ardour was compiled with gcc5, warn on gcc4 systems
-	if ! ${NORM_USER} "${PKG_PATH}/.gcc-glibmm-abi-check --gcc5 > /dev/null"; then
-		echo ""
-		echo "WARNING: GCC4/5 libstdc++ ABI Mismatch"
-		echo ""
-		echo "Ardour was compiled with gcc5, your system uses an older version of the"
-		echo "standard c++ library. Plugins on your system may not load or plugin-UIs"
-		echo "may cause crashes."
-		echo ""
-		ANSWER=$(VaildateYesNoQuestion "Continue anyway?")
-		if test "n" = $ANSWER; then
-			exit 1
-		fi
-	fi
-else
-	# Ardour was compiled with gcc4, warn on gcc5 systems
-	if ! ${NORM_USER} "${PKG_PATH}/.gcc-glibmm-abi-check --gcc4 > /dev/null"; then
-		echo ""
-		echo "WARNING: GCC4/5 libstdc++ ABI Mismatch"
-		echo ""
-		echo "Ardour was compiled with gcc4, your system uses a newer version of the"
-		echo "standard c++ library. Plugins on your system may not load or plugin-UIs"
-		echo "may cause crashes."
-		echo ""
-		ANSWER=$(VaildateYesNoQuestion "Continue anyway?")
-		if test "n" = $ANSWER; then
-			exit 1
-		fi
-	fi
-fi
-
 ####################
 # Check disk space
 ####################
@@ -313,13 +277,49 @@ else
 	fi
 fi
 
-FILESYSTEM_TYPE=$(df -P -T "${PKG_PATH}" | grep / | awk '{print $2}')
-echo "Bundle is on ${FILESYSTEM_TYPE} filesystem"
+#############################
+# Determine C11 stdlibc++ ABI
+#############################
+
+if %REPLACE_GCC5%; then
+	# Ardour was compiled with gcc5, warn on gcc4 systems
+	if ! ${NORM_USER} "${PKG_PATH}/.gcc-glibmm-abi-check --gcc5 > /dev/null"; then
+		echo ""
+		echo "WARNING: GCC4/5 libstdc++ ABI Mismatch"
+		echo ""
+		echo "Ardour was compiled with gcc5, your system uses an older version of the"
+		echo "standard c++ library. Plugins on your system may not load or plugin-UIs"
+		echo "may cause crashes."
+		echo ""
+		ANSWER=$(VaildateYesNoQuestion "Continue anyway?")
+		if test "n" = $ANSWER; then
+			exit 1
+		fi
+	fi
+else
+	# Ardour was compiled with gcc4, warn on gcc5 systems
+	if ! ${NORM_USER} "${PKG_PATH}/.gcc-glibmm-abi-check --gcc4 > /dev/null"; then
+		echo ""
+		echo "WARNING: GCC4/5 libstdc++ ABI Mismatch"
+		echo ""
+		echo "Ardour was compiled with gcc4, your system uses a newer version of the"
+		echo "standard c++ library. Plugins on your system may not load or plugin-UIs"
+		echo "may cause crashes."
+		echo ""
+		ANSWER=$(VaildateYesNoQuestion "Continue anyway?")
+		if test "n" = $ANSWER; then
+			exit 1
+		fi
+	fi
+fi
 
 #####################
 # Unpack the bundle
 #####################
 
+FILESYSTEM_TYPE=$(df -P -T "${PKG_PATH}" | grep / | awk '{print $2}')
+echo "Bundle is on ${FILESYSTEM_TYPE} filesystem"
+
 # untar the correct bundle for us to install
 echo "Unpacking bundle for $ARCH"
 
-- 
cgit v1.2.3