mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-19 09:50:29 +01:00
Code Issues Projects Releases Wiki Activity

Travis: add lzma and zstd, where available

Browse Source 
Forward-ports parts of the 0.3.2 travis config on top of the 0.2.9
merge.

Part of 24629, also fixes 27090.
This commit is contained in:
teor 2018-08-09 19:33:28 +10:00
parent 38cf52b023
commit e4d7f2667c
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -85,8 +85,11 @@ addons:
- zlib1g-dev
## Optional dependencies
- libcap-dev
- liblzma-dev
- libscrypt-dev
- libseccomp-dev
## zstd doesn't exist in Ubuntu Trusty
#- libzstd
## Conditional dependencies
## Always installed, so we don't need sudo
- asciidoc
@ -117,6 +120,8 @@ 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 [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xz; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install zstd; 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

3
changes/bug27090 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (continuous integration):
- Build with zstd on macOS.
Fixes bug 27090; bugfix on 0.3.1.5-alpha.