ardour/livetrax
13
0
Fork 0
Code

allow to manually override gcc ABI selection in the installer

Browse Source
This commit is contained in:
Robin Gareus 2016-08-12 13:36:04 +02:00
parent c8c6bca658
commit 8e1de17319
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/linux_packaging/install.sh
View File

@ -15,14 +15,14 @@ cd "${PKG_PATH}"
# fd 1 is stdout
if [ ! -t 1 ]; then
if which xterm > /dev/null; then
exec xterm -e "${PKG_PATH}/.stage2.run"
exec xterm -e "${PKG_PATH}/.stage2.run $@"
elif which gnome-terminal > /dev/null; then
exec gnome-terminal -e "${PKG_PATH}/.stage2.run"
exec gnome-terminal -e "${PKG_PATH}/.stage2.run $@"
elif which konsole > /dev/null; then
exec konsole -e "${PKG_PATH}/.stage2.run"
exec konsole -e "${PKG_PATH}/.stage2.run $@"
fi
else
"${PKG_PATH}/.stage2.run"
"${PKG_PATH}/.stage2.run" "$@"
fi
cd "${SAVED_PWD}"

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

@ -240,6 +240,13 @@ if test -n "$MULTABI_BUNDLE"; then
else
ABI=-gcc5
fi
# allow to manually override
if test "$1" = "--gcc4"; then
ABI=-gcc4
fi
if test "$1" = "--gcc5"; then
ABI=-gcc5
fi
else
ABI=
fi