ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

gcc ABI check happens before unpacking

This commit is contained in:
Robin Gareus 2015-10-04 17:52:29 +02:00
parent ac814da4be
commit 00c9d1bf34
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/linux_packaging/build
View File

@ -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

12
tools/linux_packaging/package
View File

@ -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

4
tools/linux_packaging/stage2.run.in
View File

@ -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 ""