summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-07-23 16:13:30 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-07-23 16:13:30 +0000
commit36946dd1c2a38c965c5f4418a07040a46958462f (patch)
tree791c05ed4cd6980a003cf23b8c04ccde976b1b4d /tools
parentc623cfe0f3f1877aff480d64165965c5956a643c (diff)
fixes for the linux build script
git-svn-id: svn://localhost/ardour2/branches/3.0@13070 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'tools')
-rwxr-xr-xtools/linux_packaging/build5
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 6c2a257402..11fa71dd4e 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -87,9 +87,6 @@ if test x$STRIP != xall -a x$STRIP != xnone -a x$STRIP != xsome ; then
exit 1
fi
-# Error out whenever possible
-set -e
-
release_version=`grep -m 1 '^VERSION' ../../wscript | awk '{print $3}' | sed "s/'//g"`
svn_version=`grep -m 1 'svn_revision =' ../../libs/ardour/svn_revision.cc | cut -d"'" -f 2`
echo "Version is $release_version / $svn_version"
@@ -450,7 +447,7 @@ while [ true ] ; do
# reset RPATH so that the runtime linker never looks
# in places we don't want it to
#
- patchelf --set-rpath $Libraries $Libraries/`basename $dep`
+ chrpath -r foo $Libraries/`basename $dep`
if echo $dep | grep -sq '^/' ; then
# absolute path, candidate for stripping
deplibs="$deplibs $base"