diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2018-07-10 22:51:37 +0530 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2018-07-10 13:21:37 -0400 |
| commit | 05affa665700b7dc0e5aff427c943614a436615e (patch) | |
| tree | 4954479959035bd372b53229a5064793f992bc3b /.travis | |
| parent | d8aba9f3aa657f1241b7a0de3cb025327723b61d (diff) | |
| download | cryptography-05affa665700b7dc0e5aff427c943614a436615e.tar.gz cryptography-05affa665700b7dc0e5aff427c943614a436615e.tar.bz2 cryptography-05affa665700b7dc0e5aff427c943614a436615e.zip | |
try compiling with asm for our custom openssl (#4328)
* try compiling with asm for our custom openssl
* we also need to update the cache dir
* try actually compiling it
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/install.sh | 9 | ||||
| -rwxr-xr-x | .travis/run.sh | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index 6cb0a6b5..a4aa9a42 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -14,21 +14,22 @@ shlib_sed() { # download, compile, and install if it's not already present via travis # cache if [ -n "${OPENSSL}" ]; then - OPENSSL_DIR="ossl-1/${OPENSSL}" + OPENSSL_DIR="ossl-2/${OPENSSL}" if [[ ! -f "$HOME/$OPENSSL_DIR/bin/openssl" ]]; then curl -O "https://www.openssl.org/source/openssl-${OPENSSL}.tar.gz" tar zxf "openssl-${OPENSSL}.tar.gz" pushd "openssl-${OPENSSL}" - ./config shared no-asm no-ssl2 no-ssl3 -fPIC --prefix="$HOME/$OPENSSL_DIR" + ./config shared no-ssl2 no-ssl3 -fPIC --prefix="$HOME/$OPENSSL_DIR" shlib_sed make depend + make -j"$(nproc)" # avoid installing the docs # https://github.com/openssl/openssl/issues/6685#issuecomment-403838728 - make -j"$(nproc)" install_sw install_ssldirs + make install_sw install_ssldirs popd fi elif [ -n "${LIBRESSL}" ]; then - LIBRESSL_DIR="ossl-1/${LIBRESSL}" + LIBRESSL_DIR="ossl-2/${LIBRESSL}" if [[ ! -f "$HOME/$LIBRESSL_DIR/bin/openssl" ]]; then curl -O "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${LIBRESSL}.tar.gz" tar zxf "libressl-${LIBRESSL}.tar.gz" diff --git a/.travis/run.sh b/.travis/run.sh index a68ad157..32e9874b 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -12,7 +12,7 @@ if [ -n "${LIBRESSL}" ]; then OPENSSL=$LIBRESSL fi if [ -n "${OPENSSL}" ]; then - OPENSSL_DIR="ossl-1/${OPENSSL}" + OPENSSL_DIR="ossl-2/${OPENSSL}" export PATH="$HOME/$OPENSSL_DIR/bin:$PATH" export CFLAGS="-I$HOME/$OPENSSL_DIR/include" |