[tor-commits] [tor-messenger-build/esr52] Compile Linux builds with Selfrando

[sukhbir at torproject.org]

commit f63b980484f55bdf0bab86720587077b4474b679
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Sun Sep 3 12:41:38 2017 -0400

    Compile Linux builds with Selfrando
    
    Changes borrowed from tor-browser-build.git
---
 keyring/elfutils.gpg        | 1 +
 keyring/selfrando.gpg       | 1 +
 projects/elfutils           | 1 +
 projects/instantbird/build  | 8 ++++++++
 projects/instantbird/config | 3 +++
 projects/selfrando          | 1 +
 tor-browser-build           | 2 +-
 7 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/keyring/elfutils.gpg b/keyring/elfutils.gpg
new file mode 120000
index 0000000..6e82beb
--- /dev/null
+++ b/keyring/elfutils.gpg
@@ -0,0 +1 @@
+../tor-browser-build/keyring/elfutils.gpg
\ No newline at end of file
diff --git a/keyring/selfrando.gpg b/keyring/selfrando.gpg
new file mode 120000
index 0000000..fee6b9c
--- /dev/null
+++ b/keyring/selfrando.gpg
@@ -0,0 +1 @@
+../tor-browser-build/keyring/selfrando.gpg
\ No newline at end of file
diff --git a/projects/elfutils b/projects/elfutils
new file mode 120000
index 0000000..b4beda5
--- /dev/null
+++ b/projects/elfutils
@@ -0,0 +1 @@
+../tor-browser-build/projects/elfutils
\ No newline at end of file
diff --git a/projects/instantbird/build b/projects/instantbird/build
index 7813fe2..d9cbdb0 100644
--- a/projects/instantbird/build
+++ b/projects/instantbird/build
@@ -28,6 +28,14 @@ mkdir -p /var/tmp/build
   export PATH="/var/tmp/dist/binutils/bin:$PATH"
 [% END -%]
 
+[% 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"
+  # 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
 
 [% IF c("var/osx") %]
diff --git a/projects/instantbird/config b/projects/instantbird/config
index ed09aa0..1d89837 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -83,6 +83,9 @@ input_files:
   - name: binutils
     project: binutils
     enable: '[% c("var/linux") %]'
+  - project: selfrando
+    name: selfrando
+    enable: '[% c("var/linux") %]'
   - project: gcc
     name: gcc
     enable: '[% c("var/windows") %]'
diff --git a/projects/selfrando b/projects/selfrando
new file mode 120000
index 0000000..c7e52e1
--- /dev/null
+++ b/projects/selfrando
@@ -0,0 +1 @@
+../tor-browser-build/projects/selfrando/
\ No newline at end of file
diff --git a/tor-browser-build b/tor-browser-build
index 86210c6..da7485a 160000
--- a/tor-browser-build
+++ b/tor-browser-build
@@ -1 +1 @@
-Subproject commit 86210c6821e393e98dd58c7d7bb6223755b496d5
+Subproject commit da7485a0b8f89b9ee2278d6132fc7bb53d5220e8