Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
David Goulet
Tor
Commits
74b3a340
Unverified
Commit
74b3a340
authored
Aug 09, 2018
by
teor
Browse files
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.
parent
7cf7b52f
Changes
1
Hide whitespace changes
Inline
Side-by-side
.travis.yml
View file @
74b3a340
...
...
@@ -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.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment