commit 4074cbc2a727daf51ff9fdab29e0a0da3ec078aa Merge: e76952c d161cb7 Author: Georg Koppen gk@torproject.org Date: Wed Jun 6 19:02:02 2018 +0000

Merge remote-tracking branch 'sukhe/bug-26153'

projects/firefox/build | 14 +++++++------- projects/firefox/config | 6 +++--- projects/selfrando/config | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-)

diff --cc projects/firefox/build index 8278c14,cbd9250..83a7691 --- a/projects/firefox/build +++ b/projects/firefox/build @@@ -40,15 -40,15 +40,15 @@@ EO export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%]

- #[% IF c("var/linux") && ! c("var/release") -%] - # 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" - # # We need to avoid the shuffling while building as this breaks compilation - # export SELFRANDO_skip_shuffle= - #[% END -%] + [% IF c("var/linux") && ! c("var/release") -%] + 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" + # We need to avoid the shuffling while building as this breaks compilation + export SELFRANDO_skip_shuffle= + [% END -%]

-[% IF c("var/linux") %] +[% IF ! c("var/windows") %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] export PATH="/var/tmp/dist/rust/bin:$PATH" diff --cc projects/firefox/config index 927fb0b,418daa3..97efc7b --- a/projects/firefox/config +++ b/projects/firefox/config @@@ -81,13 -81,11 +81,13 @@@ input_files - project: binutils name: binutils enable: '[% c("var/linux") %]' - # - project: selfrando - # name: selfrando - # enable: '[% c("var/linux") && ! c("var/release") %]' + - project: selfrando + name: selfrando + enable: '[% c("var/linux") && ! c("var/release") %]' - filename: fix-info-plist.py enable: '[% c("var/osx") %]' + - filename: no-dmg.patch + enable: '[% c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll sha256sum: 8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 enable: '[% c("var/windows-i686") %]'