Unverified Commit 040e6a43 authored by boklm's avatar boklm
Browse files

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
parent a9b07efe
......@@ -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') %]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment