X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/5b9a960d7e2b7d63809bc010f98aa3574c333945..f9fc47c910efe5e213928dfb67b4fea07b50f36e:/packages/openssl/build.sh

diff --git a/packages/openssl/build.sh b/packages/openssl/build.sh
index 22643b93..e3ea7dbc 100755
--- a/packages/openssl/build.sh
+++ b/packages/openssl/build.sh
@@ -1,11 +1,16 @@
 TERMUX_PKG_HOMEPAGE=https://www.openssl.org/
 TERMUX_PKG_DESCRIPTION="Library implementing the SSL and TLS protocols as well as general purpose cryptography functions"
 TERMUX_PKG_DEPENDS="ca-certificates"
-TERMUX_PKG_VERSION=1.0.2h
-TERMUX_PKG_BUILD_REVISION=1
-TERMUX_PKG_SRCURL="http://www.openssl.org/source/openssl-${TERMUX_PKG_VERSION}.tar.gz"
+TERMUX_PKG_VERSION=1.0.2o
+TERMUX_PKG_SHA256=ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d
+TERMUX_PKG_SRCURL=https://www.openssl.org/source/openssl-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_RM_AFTER_INSTALL="bin/c_rehash etc/ssl/misc"
 TERMUX_PKG_BUILD_IN_SRC=yes
+# Avoid assembly errors, see
+# https://github.com/android-ndk/ndk/issues/144
+# https://github.com/openssl/openssl/issues/1498
+# May be fixed in later openssl version.
+TERMUX_PKG_CLANG=no
 
 # Information about compilation and installation of openssl:
 # http://wiki.openssl.org/index.php/Compilation_and_Installation
@@ -13,23 +18,29 @@ TERMUX_PKG_BUILD_IN_SRC=yes
 termux_step_configure () {
 	perl -p -i -e "s@TERMUX_CFLAGS@$CFLAGS@g" Configure
 	rm -Rf $TERMUX_PREFIX/lib/libcrypto.* $TERMUX_PREFIX/lib/libssl.*
-	TERMUX_OPENSSL_PLATFORM_SUFFIX=""
-        test $TERMUX_ARCH = "arm" && TERMUX_OPENSSL_PLATFORM_SUFFIX="-armv7"
-        test $TERMUX_ARCH = "i686" && TERMUX_OPENSSL_PLATFORM_SUFFIX="-x86"
-        # If enabling zlib-dynamic we need "zlib-dynamic" instead of "no-comp no-dso":
-	./Configure android$TERMUX_OPENSSL_PLATFORM_SUFFIX --prefix=$TERMUX_PREFIX \
+	test $TERMUX_ARCH = "arm" && TERMUX_OPENSSL_PLATFORM="android-armv7"
+	test $TERMUX_ARCH = "aarch64" && TERMUX_OPENSSL_PLATFORM="linux-aarch64"
+	test $TERMUX_ARCH = "i686" && TERMUX_OPENSSL_PLATFORM="android-x86"
+	test $TERMUX_ARCH = "x86_64" && TERMUX_OPENSSL_PLATFORM="linux-x86_64"
+	# If enabling zlib-dynamic we need "zlib-dynamic" instead of "no-comp no-dso":
+	./Configure $TERMUX_OPENSSL_PLATFORM \
+		--prefix=$TERMUX_PREFIX \
 		--openssldir=$TERMUX_PREFIX/etc/tls \
 		shared \
-                no-comp no-dso \
-                no-ssl2 no-hw no-engines no-psk no-srp
+		no-comp \
+		no-dso \
+		no-ssl2 \
+		no-hw \
+		no-engines \
+		no-srp
 }
 
 termux_step_make () {
-        make depend
-        make -j 1 all
+	make depend
+	make -j 1 all
 }
 
 termux_step_make_install () {
-        # "install_sw" instead of "install" to not install man pages
+	# "install_sw" instead of "install" to not install man pages:
 	make -j 1 install_sw MANDIR=$TERMUX_PREFIX/share/man MANSUFFIX=.ssl
 }