commit 8cc61d29d348e154f43474b47a0b0746301602a9 Author: Nicolas Vigier <boklm@torproject.org> Date: Thu Apr 6 15:50:11 2017 +0200 Bug 20426: build tor for Windows using faketime --- projects/tor/build | 4 ++-- projects/tor/config | 4 ++++ rbm.conf | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/projects/tor/build b/projects/tor/build index 064ff44..c1296fe 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -60,8 +60,8 @@ find -type f -print0 | xargs -0 [% c("var/touch") %] [% IF c("var/windows") %]--with-zlib-dir="$zlibdir"[% END %] \ [% IF c("var/osx") %]--enable-static-openssl[% END %] \ --prefix="$distdir" [% c("var/configure_opt") %] -[% IF c("var/osx") -%] - export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 +[% IF c("var/osx") || c("var/windows") -%] + export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" [% END -%] make -j4 diff --git a/projects/tor/config b/projects/tor/config index 55637dc..961c1f3 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -40,6 +40,10 @@ targets: var: arch_deps: - faketime + windows-i686: + var: + arch_deps: + - faketime expert-bundle: var: expert_bundle: 1 diff --git a/rbm.conf b/rbm.conf index d7c8b34..355c593 100644 --- a/rbm.conf +++ b/rbm.conf @@ -162,6 +162,7 @@ targets: - libtool - zip - unzip + faketime_path: /usr/lib/faketime/libfaketime.so.1 torbrowser-osx-x86_64: - osx-x86_64 @@ -184,6 +185,7 @@ targets: - libtool - zip - unzip + faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 # The no_build_id target can be useful if you want to quickly display # a build template or other option but don't want to spend time to