[tor-commits] [tor-browser-build/master] Fix tor dependency on libevent-*.dylib on OSX

[boklm at torproject.org]

commit 040e6a4309f6816e7f076e517202c2e832b603a9
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Wed Feb 15 17:13:38 2017 +0100

    Fix tor dependency on libevent-*.dylib on OSX
    
    Extract libevent in /var/tmp/dist rather than /var/tmp/build so that
    the x86_64-apple-darwin10-install_name_tool command can work.
    
    At the same time, we also change openssl to use this directory.
    
    This problem was reported in this comment:
    https://trac.torproject.org/projects/tor/ticket/17379#comment:12
---
 projects/tor/build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/tor/build b/projects/tor/build
index 040693e..1f42add 100644
--- a/projects/tor/build
+++ b/projects/tor/build
@@ -22,11 +22,11 @@ mkdir -p $TORBINDIR
 mkdir -p $TORCONFIGDIR
 [% END %]
 
-tar -C /var/tmp/build -xf [% c('input_files_by_name/openssl') %]
-tar -C /var/tmp/build -xf [% c('input_files_by_name/libevent') %]
+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
-libeventdir=/var/tmp/build/libevent
-openssldir=/var/tmp/build/openssl
+libeventdir=/var/tmp/dist/libevent
+openssldir=/var/tmp/dist/openssl
 
 [% IF c("var/windows") %]
 tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %]