Unverified Commit 0a633e62 authored by boklm's avatar boklm
Browse files

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/.
parent ee32f3ea
......@@ -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
......
# 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
......
......@@ -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") %]'
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