[tor-commits] [tor-browser-build/master] Bug 28260: Use Rust 1.28.0 to build Tor

[gk at torproject.org]

commit 0a633e6289822f316b838b32fe0135d5b7c9967d
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Wed Oct 31 11:04:03 2018 +0100

    Bug 28260: Use Rust 1.28.0 to build Tor
    
    As rbm currently does not do deep merge of options hashes (bug 26185) we
    cannot modify var/* options from the input_files section (or we lose all
    the other var/* options). As a workaround we move the two options we
    need to modify under input_file_var/ instead of var/.
---
 projects/rust/build  |  4 ++--
 projects/rust/config | 11 +++++++++--
 projects/tor/config  |  5 +++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/projects/rust/build b/projects/rust/build
index 5f421c7..7ae3073 100644
--- a/projects/rust/build
+++ b/projects/rust/build
@@ -2,7 +2,7 @@
 [% c('var/setarch') %]
 [% c("var/set_default_env") -%]
 distdir=/var/tmp/dist/[% project %]
-mkdir -p /var/tmp/dist
+mkdir -p $distdir
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %]
 export PATH="/var/tmp/dist/cmake/bin:$PATH"
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/prev_rust') %]
@@ -32,7 +32,7 @@ export PATH="$distdir-rust-old/bin:$PATH"
   done
   cd ..
   ln -s x86_64-apple-darwin11 x86_64-apple-darwin
-  mkdir -p $distdir/helper
+  mkdir $distdir/helper
 
   # We need to adapt our CFLAGS and make sure our flags are passed down to all
   # dependencies. Using `CFLAGS_x86_apple-darwin` did not do the trick, so resort
diff --git a/projects/rust/config b/projects/rust/config
index d3f9c40..83ae690 100644
--- a/projects/rust/config
+++ b/projects/rust/config
@@ -1,8 +1,15 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-version: 1.26.1
-var:
+version: '[% c("input_file_var/rust_version") %]'
+
+# those values can be changed from the input_files section of other
+# projects. See projects/tor/config and bug 28260.
+input_file_var:
+  rust_version: 1.26.1
   prev_version: 1.25.0
+
+var:
+  prev_version: '[% c("input_file_var/prev_version") %]'
   rust_arch: '[% c("arch") %]'
   container:
     use_container: 1
diff --git a/projects/tor/config b/projects/tor/config
index bb743ca..cc6df23 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -60,4 +60,9 @@ input_files:
     project: '[% c("var/compiler") %]'
   - name: rust
     project: rust
+    # Tor needs rust >= 1.28.0
+    # See bug 28260
+    input_file_var:
+      rust_version: 1.28.0
+      prev_version: 1.27.2
     enable: '[% c("var/linux") && c("var/nightly") %]'