[tor-commits] [tor/release-0.3.2] Travis: make macOS builds work for Tor 0.2.9

[nickm@xxxxxxxxxxxxxx]

commit 74b3a340df0df1eb803b4b17039725fc42d5a86a
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Thu Aug 9 17:44:11 2018 +1000

    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.
---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6169c808a..c2db6b78b 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.



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits