[tbb-commits] [tor-browser-build/master] projects/tor: use faketime on OSX

boklm at torproject.org boklm at torproject.org
Tue Feb 14 12:06:36 UTC 2017


commit de8a0de76cf4a07bf2e9138e9c39bd4af8a93446
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Tue Feb 14 13:04:22 2017 +0100

    projects/tor: use faketime on OSX
---
 projects/tor/build  | 7 +++++++
 projects/tor/config | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/projects/tor/build b/projects/tor/build
index bd86928..a568512 100644
--- a/projects/tor/build
+++ b/projects/tor/build
@@ -58,8 +58,15 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
 ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \
     [% IF c("var/windows") %]--with-zlib-dir="$zlibdir"[% END %] \
     --prefix="$distdir" [% c("var/configure_opt") %]
+[% IF c("var/osx") -%]
+  export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+  export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]"
+[% END -%]
 make -j4
 make install
+[% IF c("var/osx") -%]
+  unset LD_PRELOAD
+[% END -%]
 cp $distdir/share/tor/geoip $TORCONFIGDIR
 cp $distdir/share/tor/geoip6 $TORCONFIGDIR
 
diff --git a/projects/tor/config b/projects/tor/config
index b73a447..2fbbf24 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -36,6 +36,10 @@ targets:
         - libtool
         - zlib1g-dev
         - hardening-wrapper
+  osx-x86_64:
+    var:
+      arch_deps:
+        - faketime
   expert-bundle:
     var:
       expert_bundle: 1



More information about the tbb-commits mailing list