diff options
| author | teor <teor@torproject.org> | 2018-08-09 17:44:11 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-08-09 22:18:44 +1000 |
| commit | 74b3a340df0df1eb803b4b17039725fc42d5a86a (patch) | |
| tree | 512fe889174f91631a5401fed8064038b81cadc2 | |
| parent | 7cf7b52fcab81c55a4c493bad68eddc0d27a0d63 (diff) | |
| download | tor-74b3a340df0df1eb803b4b17039725fc42d5a86a.tar.gz tor-74b3a340df0df1eb803b4b17039725fc42d5a86a.zip | |
Travis: make macOS builds work for Tor 0.2.9
Tor 0.2.9 needs extra help to find OpenSSL on macOS.
Part of 24629.
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 6169c808ae..c2db6b78b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -102,13 +102,15 @@ install: # - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install zlib; fi ## If we're on OSX also install the optional dependencies - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libscrypt; fi + ## If we're on OSX, OpenSSL is keg-only, so tor 0.2.9 and later need to be configured --with-openssl-dir= to build + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then OPENSSL_OPTIONS=--with-openssl-dir=`brew --prefix openssl`; fi ## Install conditional features ## Install coveralls - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi script: - ./autogen.sh - - CONFIGURE_FLAGS="$COVERAGE_OPTIONS $HARDENING_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules" - echo $CONFIGURE_FLAGS - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. |