github
/
openvpn-gui
mirror of https://github.com/OpenVPN/openvpn-gui
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #205 from chipitsine/openssl_1.1.0 

travis-ci: add openssl-1.1.0 support
pull/207/head
Samuli Seppänen 2018-01-23 13:58:09 +02:00 committed by GitHub
parent 4055f86206 8418bc7f45
commit b54365788e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis-build-openssl.sh
View File

@ -1,14 +1,15 @@
#!/bin/bash
set -e
if [ ! -f download-cache/openssl-${OPENSSL_VERSION}.tar.gz ]; then wget -P download-cache/ https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz; fi
mkdir image
tar zxf download-cache/openssl-${OPENSSL_VERSION}.tar.gz && cd openssl-${OPENSSL_VERSION}
if [ "$CHOST" == "i686-w64-mingw32" ]; then export target=mingw; fi
if [ "$CHOST" == "x86_64-w64-mingw32" ]; then export target=mingw64; fi
./Configure --prefix=/ --cross-compile-prefix=${CHOST}- shared $target no-multilib no-capieng --openssldir=/etc/ssl --libdir=/lib -static-libgcc >build.log 2>&1 || (cat build.log && exit 1)
make install INSTALL_PREFIX="${HOME}/image" INSTALLTOP="/" MANDIR="/tmp" >build.log 2>&1 || (cat build.log && exit 1)
if [ ${CHOST} == "i686-w64-mingw32" ]; then export target=mingw; fi
if [ ${CHOST} == "x86_64-w64-mingw32" ]; then export target=mingw64; fi
./Configure --prefix=/ --cross-compile-prefix=${CHOST}- shared $target no-capieng --openssldir=/etc/ssl --libdir=/lib -static-libgcc >build.log 2>&1 || (cat build.log && exit 1)
make install $([[ ${OPENSSL_VERSION} == "1.0."* ]] && echo "INSTALL_PREFIX" || echo "DESTDIR")="${HOME}/image" INSTALLTOP="/" MANDIR="/tmp" >build.log 2>&1 || (cat build.log && exit 1)
cd ..
export OPENSSL_CRYPTO_CFLAGS="-I${HOME}/image/include"

6
.travis.yml
View File

@ -7,7 +7,7 @@ compiler: gcc
env:
global:
- OPENSSL_VERSION=1.0.2k
- OPENSSL_VERSION=1.0.2n
matrix:
fast_finish: true
@ -16,6 +16,10 @@ matrix:
env: CHOST=i686-w64-mingw32 CONFIG=""
- compiler: ": Win64"
env: CHOST=x86_64-w64-mingw32 CONFIG=""
- compiler: ": Win32 + openssl-1.1.0"
env: CHOST=i686-w64-mingw32 CONFIG="" OPENSSL_VERSION=1.1.0g
- compiler: ": Win64 + openssl-1.1.0"
env: CHOST=x86_64-w64-mingw32 CONFIG="" OPENSSL_VERSION=1.1.0g
- compiler: ": Win32"
env: CHOST=i686-w64-mingw32 CONFIG="--disable-password-change"
- compiler: ": Win64"