mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

build-system: update to current OpenSSL version

Browse source 
This is required to compile it on ARM64 Macs (and of course also is
the right thing to do overall).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2022-02-03 21:23:04 -08:00
parent 3d72fba19f
commit 7dc3afba31
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packaging/android/variables.sh
View file

@ -11,4 +11,4 @@ ANDROID_PLATFORMS=android-29
ANDROID_NDK=ndk/${NDK_VERSION} ANDROID_NDK=ndk/${NDK_VERSION}
# OpenSSL also has an entry in get-dep-lib.sh line 103 # OpenSSL also has an entry in get-dep-lib.sh line 103
# that needs to be updated as well. # that needs to be updated as well.
OPENSSL_VERSION=1.1.1h OPENSSL_VERSION=1.1.1m

4
scripts/get-dep-lib.sh
View file

@ -7,7 +7,7 @@ CURRENT_LIBZIP="rel-1-5-1"
CURRENT_LIBGIT2="v1.0.1" CURRENT_LIBGIT2="v1.0.1"
CURRENT_LIBCURL="curl-7_54_1" CURRENT_LIBCURL="curl-7_54_1"
CURRENT_LIBUSB="v1.0.25" CURRENT_LIBUSB="v1.0.25"
CURRENT_OPENSSL="OpenSSL_1_1_1h" CURRENT_OPENSSL="OpenSSL_1_1_1m"
CURRENT_LIBSSH2="libssh2-1.8.0" CURRENT_LIBSSH2="libssh2-1.8.0"
CURRENT_XSLT="v1.1.34" CURRENT_XSLT="v1.1.34"
CURRENT_SQLITE="3190200" CURRENT_SQLITE="3190200"
@ -103,7 +103,7 @@ fi
# FIX FOR ANDROID, # FIX FOR ANDROID,
if [ "$PLATFORM" == "singleAndroid" ] ; then if [ "$PLATFORM" == "singleAndroid" ] ; then
CURRENT_OPENSSL="OpenSSL_1_1_1h" CURRENT_OPENSSL="OpenSSL_1_1_1m"
# If changing the openSSL version here, make sure to change it in packaging/android/variables.sh also. # If changing the openSSL version here, make sure to change it in packaging/android/variables.sh also.
fi fi
# no curl and old libs (never version breaks) # no curl and old libs (never version breaks)