commit dd007eb1419dac3905a5aa53dbbab02bea19d92b Author: Georg Koppen gk@torproject.org Date: Wed May 1 18:19:10 2019 +0000

Bug 29731: Remove faketime for Windows builds

We link with `--no-insert-timestamp` when cross-compiling for Windows. This should make using `faketime` obsolete when building tor. It seems Rust does not like faking time and frequently hangs while compiling in that case. --- projects/tor/build | 2 +- projects/tor/config | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/projects/tor/build b/projects/tor/build index 0860b6f..7f9fd53 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -85,7 +85,7 @@ find -type f -print0 | xargs -0 [% c("var/touch") %] [% 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") || c("var/windows") -%] +[% IF c("var/osx") -%] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" [% END -%] diff --git a/projects/tor/config b/projects/tor/config index 3e7c45f..bf9ec5a 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -41,10 +41,6 @@ targets: var: arch_deps: - faketime - windows: - var: - arch_deps: - - faketime expert-bundle: var: expert_bundle: 1