From 340fcae409869bcda830afc4b2546f8257376674 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Mon, 24 Jun 2019 20:55:18 +0200 Subject: [PATCH] openssl: Use getauxval(3) for cpu capabilities --- packages/openssl/build.sh | 1 + packages/openssl/crypto-armcap.c.patch | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 packages/openssl/crypto-armcap.c.patch diff --git a/packages/openssl/build.sh b/packages/openssl/build.sh index 2db572e9e..c245292eb 100644 --- a/packages/openssl/build.sh +++ b/packages/openssl/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Library implementing the SSL and TLS protocols as well a TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_DEPENDS="ca-certificates" TERMUX_PKG_VERSION=1.1.1c +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90 TERMUX_PKG_SRCURL=https://www.openssl.org/source/openssl-${TERMUX_PKG_VERSION/\~/-}.tar.gz TERMUX_PKG_CONFFILES="etc/tls/openssl.cnf" diff --git a/packages/openssl/crypto-armcap.c.patch b/packages/openssl/crypto-armcap.c.patch new file mode 100644 index 000000000..321a70d09 --- /dev/null +++ b/packages/openssl/crypto-armcap.c.patch @@ -0,0 +1,16 @@ +diff -u -r ../openssl-1.1.1c/crypto/armcap.c ./crypto/armcap.c +--- ../openssl-1.1.1c/crypto/armcap.c 2019-05-28 13:12:21.000000000 +0000 ++++ ./crypto/armcap.c 2019-06-23 19:53:23.465656000 +0000 +@@ -63,12 +63,8 @@ + void OPENSSL_cpuid_setup(void) __attribute__ ((constructor)); + # endif + +-# if defined(__GLIBC__) && defined(__GLIBC_PREREQ) +-# if __GLIBC_PREREQ(2, 16) + # include + # define OSSL_IMPLEMENT_GETAUXVAL +-# endif +-# endif + + /* + * ARM puts the feature bits for Crypto Extensions in AT_HWCAP2, whereas