projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
22b07e0
)
fix case where NORM_USER (su) changes dirs.
author
Robin Gareus
<robin@gareus.org>
Mon, 5 Oct 2015 15:12:13 +0000
(17:12 +0200)
committer
Robin Gareus
<robin@gareus.org>
Mon, 5 Oct 2015 15:12:13 +0000
(17:12 +0200)
tools/linux_packaging/stage2.run.in
patch
|
blob
|
history
diff --git
a/tools/linux_packaging/stage2.run.in
b/tools/linux_packaging/stage2.run.in
index 6db11033d50496df9411c85877f36e1959eddcd1..4b6cb728af712a82822c47c11fcf0609a76db349 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 %REPLACE_GCC5%; then
# Ardour was compiled with gcc5, warn on gcc4 systems
- if ! ${NORM_USER} "
.
/.gcc-glibmm-abi-check --gcc5 > /dev/null"; then
+ if ! ${NORM_USER} "
${PKG_PATH}
/.gcc-glibmm-abi-check --gcc5 > /dev/null"; then
echo ""
echo "WARNING: GCC4/5 libstdc++ ABI Mismatch"
echo ""
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
fi
else
# Ardour was compiled with gcc4, warn on gcc5 systems
- if ! ${NORM_USER} "
.
/.gcc-glibmm-abi-check --gcc4 > /dev/null"; then
+ if ! ${NORM_USER} "
${PKG_PATH}
/.gcc-glibmm-abi-check --gcc4 > /dev/null"; then
echo ""
echo "WARNING: GCC4/5 libstdc++ ABI Mismatch"
echo ""
echo ""
echo "WARNING: GCC4/5 libstdc++ ABI Mismatch"
echo ""