diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-12 23:50:42 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-12 23:50:42 -0500 |
| commit | 26287be0dccc51730608475fdde8f0b3f474e20e (patch) | |
| tree | fb2f7f6c2cc9d4158835db811ca6ae2a10f684ca | |
| parent | c4359578acac27d9709c284a1f350c44245c60ef (diff) | |
| download | cryptography-26287be0dccc51730608475fdde8f0b3f474e20e.tar.gz cryptography-26287be0dccc51730608475fdde8f0b3f474e20e.tar.bz2 cryptography-26287be0dccc51730608475fdde8f0b3f474e20e.zip | |
check if openssl is installed via homebrew on osx. install if not
| -rwxr-xr-x | .travis/install.sh | 15 | ||||
| -rwxr-xr-x | .travis/run.sh | 3 |
2 files changed, 12 insertions, 6 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index 8d6840f2..fd210d43 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -3,10 +3,17 @@ set -e set -x -if [[ "${OPENSSL}" == "0.9.8" && "$(uname -s)" != "Darwin" ]]; then - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ lucid main" - sudo apt-get -y update - sudo apt-get install -y --force-yes libssl-dev/lucid +if [[ "${OPENSSL}" == "0.9.8" ]]; then + if [[ "$(uname -s)" != "Darwin" ]]; then + sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ lucid main" + sudo apt-get -y update + sudo apt-get install -y --force-yes libssl-dev/lucid + else + # travis has openssl installed via brew already, but let's be sure + if [[ "$(brew list | grep openssl)" != "openssl" ]]; then + brew install openssl + fi + fi fi if [[ "$(uname -s)" == "Darwin" ]]; then diff --git a/.travis/run.sh b/.travis/run.sh index 8b3093df..4c01d67a 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -6,8 +6,7 @@ set -x if [[ "$(uname -s)" == "Darwin" ]]; then eval "$(pyenv init -)" if [[ "${OPENSSL}" != "0.9.8" ]]; then - # travis has 1.0.1e installed via homebrew on OS X by default - # so set our flags to use that + # so set our flags to use homebrew openssl export ARCHFLAGS="-arch x86_64" export LDFLAGS="-L/usr/local/opt/openssl/lib" export CFLAGS="-I/usr/local/opt/openssl/include" |