gcc ABI check happens before unpacking

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 80025d1f101e6d2faab51962ce8fdc2d47343d4d..77541b366ccc4871e2510e92d0b3ec9a8f453134 100755 (executable)
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -661,14 +661,6 @@ sed -e "s/%REPLACE_MAJOR_VERSION%/${major_version}/;s/%REPLACE_PGM%/${APPNAME}/;
 chmod a+x stage2.run
 
 
-# gcc4/5 ABI test tool
-if [ -e $BUILD_ROOT/tools/gccabicheck/gcc-glibmm-abi-check ]; then
-       cp $BUILD_ROOT/tools/gccabicheck/gcc-glibmm-abi-check $APPBIN
-else
-       echo "!!!ERROR !!! gcc-glibmm-abi-check program is missing. packager will exit without being complete"
-       exit 1
-fi
-
 #Sanity Check file
 if [ -e $BUILD_ROOT/tools/sanity_check/sanityCheck ]; then
        cp $BUILD_ROOT/tools/sanity_check/sanityCheck $APPBIN

diff --git a/tools/linux_packaging/package b/tools/linux_packaging/package
index 653cae0b55cfe4d778a1afa95946dc2a0eb23fec..a32de23048a3e3ba206d3e4851d5418a56f7f38b 100755 (executable)
--- a/tools/linux_packaging/package
+++ b/tools/linux_packaging/package
@@ -10,7 +10,7 @@ SINGLE_ARCH="F"
 X86_BUNDLE_OK="F"
 X86_64_BUNDLE_OK="F"
 MAKESELF=""
-
+BUILD_ROOT=../../build
 
 if [ $# -eq 0 ] ; then
        echo ""  
@@ -162,6 +162,16 @@ cp install.sh ${PACKAGE}
 cp stage2.run ${PACKAGE}/.stage2.run
 cp README ${PACKAGE}
 
+# gcc4/5 ABI test tool
+if [ -e $BUILD_ROOT/tools/gccabicheck/gcc-glibmm-abi-check ]; then
+       cp $BUILD_ROOT/tools/gccabicheck/gcc-glibmm-abi-check ${PACKAGE}/.gcc-glibmm-abi-check
+else
+       echo "!!!ERROR !!! gcc-glibmm-abi-check program is missing. packager will exit without being complete"
+       rm -rf ${PACKAGE}
+       rm -f stage2.run
+       exit 1
+fi
+
 if test -n "$MAKESELF"; then
        echo "Creating self-extracting installer"
        $MAKESELF --nocomp ${PACKAGE}/ ${PACKAGE}.run ${APPNAME} ./install.sh

diff --git a/tools/linux_packaging/stage2.run.in b/tools/linux_packaging/stage2.run.in
index 45addc208eb76a6af1f3fc1ee899cf9b15cd9bbe..6db11033d50496df9411c85877f36e1959eddcd1 100755 (executable)
--- a/tools/linux_packaging/stage2.run.in
+++ b/tools/linux_packaging/stage2.run.in
@@ -235,7 +235,7 @@ esac
 
 if %REPLACE_GCC5%; then
        # Ardour was compiled with gcc5, warn on gcc4 systems
-       if ! ${NORM_USER} "${INSTALL_DEST_BASE}/${PGM_FULL_NAME}/bin/gcc-glibmm-abi-check --gcc5 > /dev/null"; then
+       if ! ${NORM_USER} "./.gcc-glibmm-abi-check --gcc5 > /dev/null"; then
                echo ""
                echo "WARNING: GCC4/5 libstdc++ ABI Mismatch"
                echo ""
@@ -250,7 +250,7 @@ if %REPLACE_GCC5%; then
        fi
 else
        # Ardour was compiled with gcc4, warn on gcc5 systems
-       if ! ${NORM_USER} "${INSTALL_DEST_BASE}/${PGM_FULL_NAME}/bin/gcc-glibmm-abi-check --gcc4 > /dev/null"; then
+       if ! ${NORM_USER} "./.gcc-glibmm-abi-check --gcc4 > /dev/null"; then
                echo ""
                echo "WARNING: GCC4/5 libstdc++ ABI Mismatch"
                echo ""