From 05affa665700b7dc0e5aff427c943614a436615e Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Tue, 10 Jul 2018 22:51:37 +0530
Subject: 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
---
 .travis.yml        | 2 +-
 .travis/install.sh | 9 +++++----
 .travis/run.sh     | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 40a85a13..0c686277 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ language: python
 cache:
     directories:
         - $HOME/.cache/pip
-        - $HOME/ossl-1/
+        - $HOME/ossl-2/
 
 # Only build master, the version branches (e.g. 1.7.x), and
 # version tags (which are apparently considered branches by travis)
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"
-- 
cgit v1.2.3