Unverified Commit 6063d5c6 authored by boklm's avatar boklm
Browse files

Bug 22242: use chrpath to remove RUNPATH added by selfrando

At the same time we add a var/selfrando variable to make it easier to
enable/disable selfrando.
parent 0bfae091
......@@ -23,7 +23,7 @@ mkdir -p /var/tmp/build
export PATH="/var/tmp/dist/binutils/bin:$PATH"
[% END -%]
[% IF c("var/linux") && ! c("var/release") -%]
[% IF c("var/selfrando") -%]
tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %]
# Selfrando wrapper
export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH"
......@@ -161,6 +161,10 @@ cd $distdir
objcopy --only-keep-debug $LIB Debug/$LIB
strip $LIB
objcopy --add-gnu-debuglink=./Debug/$LIB $LIB
[% IF c("var/selfrando") -%]
# remove RUNPATH added by selfrando (see #22242)
chrpath -d $LIB
[% END -%]
done
[% END %]
......
......@@ -48,6 +48,8 @@ targets:
- libx11-xcb-dev
# We built GCC but not the libmpc2, thus we need to install it
- libmpc2
# needed to remove RUNPATH added by selfrando (see #22242)
- chrpath
linux-x86_64:
var:
martools_filename: mar-tools-linux64.zip
......@@ -82,7 +84,7 @@ input_files:
enable: '[% c("var/linux") %]'
- project: selfrando
name: selfrando
enable: '[% c("var/linux") && ! c("var/release") %]'
enable: '[% c("var/selfrando") %]'
- filename: fix-info-plist.py
enable: '[% c("var/osx") %]'
- URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll
......
......@@ -166,6 +166,7 @@ targets:
# channels for now.
snowflake: '[% c("var/alpha") || c("var/nightly") %]'
fteproxy: 1
selfrando: '[% ! c("var/release") %]'
container:
suite: wheezy
deps:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment