diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-08-29 15:48:13 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-08-29 15:48:13 -0500 |
| commit | 5f7d9d2f68d51fe7fd89f752484920aa5680258a (patch) | |
| tree | 4732ee7fd8383cd8b6078d5c7fe6dc60ce165dd3 | |
| parent | 1055431497ded70c1ef766ea7e543e6c4bc4f0da (diff) | |
| download | cryptography-5f7d9d2f68d51fe7fd89f752484920aa5680258a.tar.gz cryptography-5f7d9d2f68d51fe7fd89f752484920aa5680258a.tar.bz2 cryptography-5f7d9d2f68d51fe7fd89f752484920aa5680258a.zip | |
update travis to static link homebrew openssl (plus one dynamic job)
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rwxr-xr-x | .travis/run.sh | 7 |
2 files changed, 15 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index c61682ed..90b2b1fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,23 +71,23 @@ matrix: - language: generic os: osx osx_image: beta-xcode6.3 - env: TOXENV=py26 + env: TOXENV=py26 CRYPTOGRAPHY_BUILD_STATIC=1 - language: generic os: osx osx_image: beta-xcode6.3 - env: TOXENV=py27 + env: TOXENV=py27 CRYPTOGRAPHY_BUILD_STATIC=1 - language: generic os: osx osx_image: beta-xcode6.3 - env: TOXENV=py33 + env: TOXENV=py33 CRYPTOGRAPHY_BUILD_STATIC=1 - language: generic os: osx osx_image: beta-xcode6.3 - env: TOXENV=py34 + env: TOXENV=py34 CRYPTOGRAPHY_BUILD_STATIC=1 - language: generic os: osx osx_image: beta-xcode6.3 - env: TOXENV=pypy + env: TOXENV=pypy CRYPTOGRAPHY_BUILD_STATIC=1 - language: generic os: osx osx_image: beta-xcode6.3 @@ -112,6 +112,10 @@ matrix: os: osx osx_image: beta-xcode6.3 env: TOXENV=docs + - language: generic + os: osx + osx_image: beta-xcode6.3 + env: TOXENV=py27 install: - ./.travis/install.sh diff --git a/.travis/run.sh b/.travis/run.sh index 17358655..b519c9fc 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -8,7 +8,12 @@ if [[ "$(uname -s)" == "Darwin" ]]; then if [[ "${OPENSSL}" != "0.9.8" ]]; then # set our flags to use homebrew openssl export ARCHFLAGS="-arch x86_64" - export LDFLAGS="-L/usr/local/opt/openssl/lib" + # if the build is static we need different LDFLAGS + if [[ "${CRYPTOGRAPHY_BUILD_STATIC}" == "1" ]]; then + export LDFLAGS="/usr/local/opt/openssl/lib/libssl.a /usr/local/opt/openssl/lib/libcrypto.a" + else + export LDFLAGS="-L/usr/local/opt/openssl/lib" + fi export CFLAGS="-I/usr/local/opt/openssl/include" # The Travis OS X jobs are run for two versions # of OpenSSL, but we only need to run the |