[tbb-commits] [tor-browser-build/master] Bug 20848: Deploy Selfrando in 32bit Linux builds

[gk at torproject.org]

commit 8db320a7a7f2f03ce516b33668ff4509e861fe8e
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Mon Jul 31 18:07:53 2017 +0200

    Bug 20848: Deploy Selfrando in 32bit Linux builds
    
    tor-browser-bundle.git author: Georg Koppen <gk at torproject.org>
---
 projects/binutils/build   |  3 +--
 projects/binutils/config  |  2 +-
 projects/firefox/build    |  3 +--
 projects/firefox/config   |  3 +--
 projects/selfrando/build  |  4 ++--
 projects/selfrando/config | 10 +++++++++-
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/projects/binutils/build b/projects/binutils/build
index baef68f..b72c41c 100644
--- a/projects/binutils/build
+++ b/projects/binutils/build
@@ -26,10 +26,9 @@ cd [% project %]-[% c("version") %]
   # Zeroing timestamps in PE headers reliably, see bug 12753.
   patch -p1 < ../peXXigen.patch
 [% END -%]
-[% IF c("var/linux-x86_64") -%]
+[% IF c("var/linux") -%]
   # We need to work around a gold linker bug in 2.24 to get selfrando working,
   # see bug 20683.
-  # XXX: 64bits only for now :(, see #20683.
   patch -p1 < $rootdir/binutils-224-gold.patch
 [% END -%]
 ./configure --prefix=$distdir [% c('var/configure_opt') %]
diff --git a/projects/binutils/config b/projects/binutils/config
index 88640f8..f272c76 100644
--- a/projects/binutils/config
+++ b/projects/binutils/config
@@ -22,4 +22,4 @@ input_files:
   - filename: peXXigen.patch
     enable: '[% c("var/windows") %]'
   - filename: binutils-224-gold.patch
-    enable: '[% c("var/linux-x86_64") %]'
+    enable: '[% c("var/linux") %]'
diff --git a/projects/firefox/build b/projects/firefox/build
index fd9fee5..c35d629 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -27,8 +27,7 @@ mkdir -p /var/tmp/build
   export PATH="/var/tmp/dist/binutils/bin:$PATH"
 [% END -%]
 
-[% IF c("var/linux-x86_64") -%]
-  # XXX: 64bits only for now :(, see #20683.
+[% IF c("var/linux") -%]
   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"
diff --git a/projects/firefox/config b/projects/firefox/config
index 5db64ff..50d7a4e 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -73,8 +73,7 @@ input_files:
     enable: '[% c("var/linux") %]'
   - project: selfrando
     name: selfrando
-    # XXX: 64bits only for now :(, see #20683.
-    enable: '[% c("var/linux-x86_64") %]'
+    enable: '[% c("var/linux") %]'
   - filename: fix-info-plist.py
     enable: '[% c("var/osx") %]'
   - URL: https://people.torproject.org/~mikeperry/mirrors/sources/msvcr100.dll
diff --git a/projects/selfrando/build b/projects/selfrando/build
index 8bbd63e..18437b5 100644
--- a/projects/selfrando/build
+++ b/projects/selfrando/build
@@ -14,9 +14,9 @@ tar -C /var/tmp/dist -xf $rootdir/[% project %]-[% c("version") %].tar.gz
 cd /var/tmp/dist
 mv [% project %]-[% c("version") %] [% project %]
 cd [% project %]
-scons -Q arch=x86_64 LIBELF_PATH="/var/tmp/dist/elfutils" FORCE_INPLACE=1 DEBUG_LEVEL=env WRITE_LAYOUTS=env LOG=console
+scons -Q arch=[% c("var/selfrando_arch") %] LIBELF_PATH="/var/tmp/dist/elfutils" FORCE_INPLACE=1 DEBUG_LEVEL=env WRITE_LAYOUTS=env LOG=console
 # Fix the path where we install selfrando
-sed -i 's|^SR_PATH=.*|SR_PATH=/var/tmp/dist/selfrando/out/x86_64/bin|' Tools/TorBrowser/tc-wrapper/ld
+sed -i 's|^SR_PATH=.*|SR_PATH=/var/tmp/dist/selfrando/out/[% c("var/selfrando_arch") %]/bin|' Tools/TorBrowser/tc-wrapper/ld
 
 cd /var/tmp/dist
 [% c('tar', {
diff --git a/projects/selfrando/config b/projects/selfrando/config
index 8b73080..33e7272 100644
--- a/projects/selfrando/config
+++ b/projects/selfrando/config
@@ -1,6 +1,6 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-version: 0.2
+version: 0.3.2
 git_hash: 'tb-v[% c("version") %]'
 git_url: https://github.com/immunant/selfrando.git
 gpg_keyring: selfrando.gpg
@@ -13,6 +13,14 @@ var:
     - scons
     - zlib1g-dev
 
+targets:
+  linux-x86_64:
+    var:
+      selfrando_arch: x86_64
+  linux-i686:
+    var:
+      selfrando_arch: x86
+
 input_files:
   - project: container-image
   - name: binutils