[tbb-commits] [tor-browser-build/master] Bug 22242: use chrpath to remove RUNPATH added by selfrando

[gk at torproject.org]

commit 6063d5c6433a294176593a070138350cc723dbfa
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Wed May 23 16:39:25 2018 +0200

    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.
---
 projects/firefox/build  | 6 +++++-
 projects/firefox/config | 4 +++-
 rbm.conf                | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index a7441bd..ea3826d 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -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 %]
 
diff --git a/projects/firefox/config b/projects/firefox/config
index 4458d48..21efac7 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -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
diff --git a/rbm.conf b/rbm.conf
index bb53bcb..c1b49f0 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -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: