[tor-commits] [tor-browser-build/master] disable selfrando

[gk at torproject.org]

commit d3339fe091e96daa6fb1918880a3eef82c068cad
Author: Arthur Edelstein <arthuredelstein at gmail.com>
Date:   Thu May 3 22:51:38 2018 -0700

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

diff --git a/projects/firefox/build b/projects/firefox/build
index 7f74c9c..88bffc2 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -40,13 +40,13 @@ EOF
   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 -%]
 
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 
diff --git a/projects/firefox/config b/projects/firefox/config
index 77ae405..0692ead 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -81,9 +81,9 @@ 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") %]'
   - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll