Skip to content

Commit a248746

Browse files
committed
Patch extension modules & update the license
1 parent 2a41fb9 commit a248746

8 files changed

Lines changed: 43 additions & 849 deletions

File tree

.travis/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if [ -n "${OPENSSL}" ]; then
99
wget --no-check-certificate -q "https://www.openssl.org/source/openssl-${OPENSSL}.tar.gz"
1010
tar zxf "openssl-${OPENSSL}.tar.gz"
1111
pushd "openssl-${OPENSSL}"
12-
./config $OPENSSL_CONFIG_FLAGS -fPIC --prefix="$HOME/$OPENSSL_DIR"
12+
./config $OPENSSL_CONFIG_FLAGS -fPIC --prefix="$OPENSSL_DIR"
1313
make depend
1414
make -j"$(nproc)"
1515
if [[ "${OPENSSL}" =~ 1.0.1 ]]; then

.travis/openssl-config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ else
88
fi
99

1010
CONFIG_HASH=$(echo "$OPENSSL_CONFIG_FLAGS" | sha1sum | sed 's/ .*$//')
11-
OPENSSL_DIR="ossl-2/${OPENSSL}${CONFIG_HASH}"
11+
OPENSSL_DIR="${HOME}/openssl/${OPENSSL}${CONFIG_HASH}"

.travis/script.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ set -ex
55

66
if [ -n "${OPENSSL}" ]; then
77
source .travis/openssl-config.sh
8-
export PATH="${HOME}/${OPENSSL_DIR}/bin:${PATH}"
9-
export CFLAGS="${CFLAGS} -I${HOME}/${OPENSSL_DIR}/include"
10-
export LDFLAGS="-L${HOME}/${OPENSSL_DIR}/lib -Wl,-rpath=${HOME}/${OPENSSL_DIR}/lib"
11-
export LD_LIBRARY_PATH="${HOME}/${OPENSSL_DIR}/lib:${LD_LIBRARY_PATH}"
8+
export PATH="${OPENSSL_DIR}/bin:${PATH}"
9+
export CFLAGS="${CFLAGS} -I${OPENSSL_DIR}/include"
10+
export LDFLAGS="-L${OPENSSL_DIR}/lib -Wl,-rpath=${OPENSSL_DIR}/lib"
11+
export LD_LIBRARY_PATH="${OPENSSL_DIR}/lib:${LD_LIBRARY_PATH}"
1212
fi
1313

1414

COPYING.LESSER

Lines changed: 0 additions & 165 deletions
This file was deleted.

0 commit comments

Comments
 (0)