commit f19f3e3d3831cfb2c9d9fbf20f601c538c70c1c3 Author: Nicolas Vigier boklm@torproject.org Date: Tue Sep 14 16:24:12 2021 +0200

Bug 40361: Stop building tor with rust in nightly builds --- projects/tor/build | 18 +----------------- projects/tor/config | 3 --- 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/projects/tor/build b/projects/tor/build index 2e32f50..0d81087 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -21,10 +21,6 @@ mkdir -p /var/tmp/build [% END %]

[% IF c("var/osx") %] - [% IF c("var/nightly") %] - # We are compiling Tor with Rust enabled for nightlies. - export TOR_RUST_TARGET=x86_64-apple-darwin - [% END %] TORBINDIR="$distdir/Contents/MacOS/Tor" TORCONFIGDIR="$distdir/Contents/Resources/TorBrowser/Tor" mkdir -p $distdir/bin @@ -39,10 +35,6 @@ mkdir -p /var/tmp/build [% IF c("var/android") %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/zstd') %] [% END %] -[% IF !c("var/android") && c("var/nightly") %] - tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] - export PATH=/var/tmp/dist/rust/bin:$PATH -[% END %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/openssl') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/libevent') %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz @@ -50,10 +42,6 @@ libeventdir=/var/tmp/dist/libevent openssldir=/var/tmp/dist/openssl/openssl

[% IF c("var/windows") %] - [% IF c("var/nightly") %] - # We are compiling Tor with Rust enabled for nightlies. - export TOR_RUST_TARGET=[% c("arch") %]-pc-windows-gnu - [% END %] # XXX: It's a bit unfortunate but we need the pthread dll here as libevent # gets compiled with pthread support once it is enabled in GCC, which we need # to do as otherwise the Rust compilaton breaks. @@ -62,9 +50,6 @@ openssldir=/var/tmp/dist/openssl/openssl $gcclibs/*.dll $mingwlibs/libwinpthread-1.dll $distdir/Tor/ [% END %]

-[% IF c("var/linux-i686") && c("var/nightly") -%] - export TOR_RUST_TARGET=i686-unknown-linux-gnu -[% END -%] [% IF c("var/linux") %] mkdir -p "$distdir/Debug/Tor" cp $openssldir/lib/libssl.so.1.1 "$distdir/Tor/" @@ -99,11 +84,10 @@ cd /var/tmp/build/[% project %]-[% c('version') %] echo '"[% c("abbrev", { abbrev_length => 16 }) %]"' > micro-revision.i ./autogen.sh find -type f -print0 | xargs -0 [% c("var/touch") %] -[% IF !c("var/android") && c("var/nightly") %]TOR_RUST_DEPENDENCIES=`pwd`/src/ext/rust/crates[% END %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ +./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ [% IF c("var/asan") %]--enable-fragile-hardening[% END %] \ [% IF c("var/windows") || c("var/android") %]--with-zlib-dir="$zlibdir"[% END %] \ [% IF c("var/osx") %]--enable-static-openssl[% END %] \ - [% IF !c("var/android") && c("var/nightly") %]--enable-rust[% END %] \ --prefix="$distdir" [% c("var/configure_opt") %] [% IF c("var/osx") -%] export LD_PRELOAD=[% c("var/faketime_path") %] diff --git a/projects/tor/config b/projects/tor/config index 1753131..7a93763 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -62,9 +62,6 @@ input_files: enable: '[% c("var/windows") || c("var/android") %]' - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - - name: rust - project: rust - enable: '[% !c("var/android") && c("var/nightly") %]' - name: zstd project: zstd enable: '[% c("var/android") %]'