ardour/livetrax
13
0
Fork 0
Code

Another step towards gcc-ABI detection when installing as root

Browse Source 
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.
This commit is contained in:
Robin Gareus 2016-08-13 00:31:56 +02:00
parent fd6dd8b19e
commit fc272ef9d7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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