From 45670b3921f46fbd43d62ae8a424dc8565137ed5 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 21 Feb 2025 13:26:16 +0100 Subject: [PATCH] [build,android] add workaround for OpenSSL tag naming OpenSSL is inconsistently naming tags and release tarballs. Add a workaround for older releases using this inconsistent scheme. --- scripts/android-build-openssl.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/android-build-openssl.sh b/scripts/android-build-openssl.sh index 4a0cdc95c..99e163fb3 100755 --- a/scripts/android-build-openssl.sh +++ b/scripts/android-build-openssl.sh @@ -43,7 +43,15 @@ function build { # Run the main program. common_parse_arguments $@ -common_update "$SCM_URL/$SCM_TAG" $SCM_TAG $BUILD_SRC $SCM_HASH + +SCM_MOD_TAG=$SCM_TAG + +# Workaround for naming of OpenSSL releases changing with every major version +case $SCM_TAG in OpenSSL_*) + SCM_MOD_TAG=${SCM_TAG//OpenSSL_/openssl-} + SCM_MOD_TAG=${SCM_MOD_TAG//_/.} +esac +common_update "$SCM_URL/$SCM_TAG" $SCM_MOD_TAG $BUILD_SRC $SCM_HASH ORG_PATH=$PATH for ARCH in $BUILD_ARCH