From: Robin Gareus <robin@gareus.org>
Date: Fri, 12 Aug 2016 22:31:56 +0000 (+0200)
Subject: Another step towards gcc-ABI detection when installing as root
X-Git-Tag: 5.1~159
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=fc272ef9d7cc224d9558809b8d473882df48d2df;p=ardour.git

Another step towards gcc-ABI detection when installing as root

makeself extracts the file with owner-only access.
When the installer itself runs as root, NORM_USER won't be able to
call the abi-test tool.
---

diff --git a/tools/linux_packaging/stage2.run.in b/tools/linux_packaging/stage2.run.in
index e1fe3ffc1d..ae4e217a49 100755
--- a/tools/linux_packaging/stage2.run.in
+++ b/tools/linux_packaging/stage2.run.in
@@ -235,7 +235,7 @@ esac
 ###################
 
 if test -n "$MULTABI_BUNDLE"; then
-	if ! ${NORM_USER} "${PKG_PATH}/.gcc-glibmm-abi-check --fail --gcc5 > /dev/null"; then
+	if ! "${PKG_PATH}/.gcc-glibmm-abi-check" --fail --gcc5; then
 		ABI=-gcc4
 	else
 		ABI=-gcc5
@@ -306,7 +306,7 @@ fi
 if test -z "$ABI"; then
 	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
+		if ! "${PKG_PATH}/.gcc-glibmm-abi-check" --gcc5; then
 			echo ""
 			echo "WARNING: GCC4/5 libstdc++ ABI Mismatch"
 			echo ""
@@ -321,7 +321,7 @@ if test -z "$ABI"; then
 		fi
 	else
 		# Ardour was compiled with gcc4, warn on gcc5 systems
-		if ! ${NORM_USER} "${PKG_PATH}/.gcc-glibmm-abi-check --gcc4 > /dev/null"; then
+		if ! "${PKG_PATH}/.gcc-glibmm-abi-check" --gcc4 ; then
 			echo ""
 			echo "WARNING: GCC4/5 libstdc++ ABI Mismatch"
 			echo ""