From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Mon, 19 Jun 2017 18:38:08 +0000 (+0500)
Subject: travis-ci: added gcc and clang openssl-1.1.0 builds
X-Git-Tag: v2.5_beta1~652
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aeac1139a34321a7f770ca20bfef886a21a89fe9;p=thirdparty%2Fopenvpn.git

travis-ci: added gcc and clang openssl-1.1.0 builds

openssl build script was modified according to official openssl manual:
https://wiki.openssl.org/index.php/Compilation_and_Installation
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Message-Id: <1497897488-15999-1-git-send-email-chipitsine@gmail.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg14890.html

Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/.travis.yml b/.travis.yml
index bb44222da..db90e03a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,9 +27,15 @@ matrix:
     - env: SSLLIB="openssl"
       os: linux
       compiler: gcc
+    - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0f"
+      os: linux
+      compiler: gcc
     - env: SSLLIB="openssl"
       os: linux
       compiler: clang
+    - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0f"
+      os: linux
+      compiler: clang
     - env: SSLLIB="mbedtls"
       os: linux
       compiler: gcc
diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh
index c5c1188fb..9cc18584f 100755
--- a/.travis/build-deps.sh
+++ b/.travis/build-deps.sh
@@ -82,7 +82,7 @@ download_openssl () {
 build_openssl_linux () {
     (
         cd "openssl-${OPENSSL_VERSION}/"
-        ./config shared --openssldir="${PREFIX}" -DPURIFY
+        ./config shared --prefix="${PREFIX}" --openssldir="${PREFIX}" -DPURIFY
         make all install_sw
     )
 }
@@ -91,7 +91,7 @@ build_openssl_osx () {
     (
         cd "openssl-${OPENSSL_VERSION}/"
         ./Configure darwin64-x86_64-cc shared \
-            --openssldir="${PREFIX}" -DPURIFY
+            --prefix="${PREFIX}" --openssldir="${PREFIX}" -DPURIFY
         make depend all install_sw
     )
 }
@@ -107,7 +107,7 @@ build_openssl_mingw () {
         fi
 
         ./Configure --cross-compile-prefix=${CHOST}- shared \
-           ${TARGET} no-multilib no-capieng --openssldir="${PREFIX}" -static-libgcc
+           ${TARGET} no-multilib no-capieng --prefix="${PREFIX}" --openssldir="${PREFIX}" -static-libgcc
         make install
     )
 }