Unverified Commit 8db320a7 authored by boklm's avatar boklm
Browse files

Bug 20848: Deploy Selfrando in 32bit Linux builds

tor-browser-bundle.git author: Georg Koppen <gk@torproject.org>
parent 373cf261
......@@ -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') %]
......
......@@ -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") %]'
......@@ -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"
......
......@@ -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
......
......@@ -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', {
......
# 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
......
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