mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Changed the openssl url and bumped the version. Refactored the openssl.sh script to avoid version duplication in the code.
This commit is contained in:
parent
71eb672923
commit
a02c074ba9
3 changed files with 9 additions and 8 deletions
|
@ -4,11 +4,11 @@ all: openssl
|
|||
|
||||
# From http://wiki.openssl.org/index.php/Android
|
||||
.PHONY: openssl
|
||||
openssl: openssl-1.0.1t/libssl.so
|
||||
openssl: openssl-${OPENSSL_VERSION}/libssl.so
|
||||
|
||||
openssl-1.0.1t/libssl.so: openssl-1.0.1t/Configure
|
||||
./openssl.sh ${ANDROID_NDK}
|
||||
openssl-${OPENSSL_VERSION}/libssl.so: openssl-${OPENSSL_VERSION}/Configure
|
||||
./openssl.sh ${ANDROID_NDK} ${OPENSSL_VERSION}
|
||||
|
||||
openssl-1.0.1t/Configure:
|
||||
wget https://www.openssl.org/source/old/1.0.1/openssl-1.0.1t.tar.gz
|
||||
tar -zxf openssl-1.0.1t.tar.gz
|
||||
openssl-${OPENSSL_VERSION}/Configure:
|
||||
URL=https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/openssl-${OPENSSL_VERSION}.tar.gz; \
|
||||
curl $$URL | tar xzf -
|
||||
|
|
|
@ -181,7 +181,7 @@ if [ ! -z "$VERBOSE" ] && [ "$VERBOSE" != "0" ]; then
|
|||
echo "ANDROID_DEV: $ANDROID_DEV"
|
||||
fi
|
||||
|
||||
cd openssl-1.0.1t
|
||||
cd openssl-$2
|
||||
perl -pi -e 's/install: all install_docs install_sw/install: install_docs install_sw/g' Makefile.org
|
||||
|
||||
# The code being built isn't maintained by us, so we redirect stderr to stdout
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue