Update nettle to v3.10

This commit is contained in:
FooIbar committed 2024-06-17 18:01:31 +08:00
1 parent c53b0986a9
commit 583d30eb5f
2 files changed
+2 -24

No files matched your search

+2 -3
View File
@@ -43,9 +43,8 @@ set(NDK_VERSION "${ANDROID_NDK_MAJOR}.${ANDROID_NDK_MINOR}.${ANDROID_NDK_BUILD}"
ExternalProject_Add(
nettle
PREFIX nettle
URL https://ftp.gnu.org/gnu/nettle/nettle-3.9.1.tar.gz
URL_MD5 29fcd2dec6bf5b48e5e3ffb3cbc4779e
PATCH_COMMAND bash -c "patch -p1 < ${CURRENT_DIR}/nettle.patch"
URL https://ftp.gnu.org/gnu/nettle/nettle-3.10.tar.gz
URL_MD5 c61453139d5fb44e9cdcc5b684b26e55
CONFIGURE_COMMAND bash ${CURRENT_DIR}/configure_nettle.sh ${NDK_VERSION} ${CMAKE_C_COMPILER_TARGET}
BUILD_COMMAND bash -c "make libnettle.a CFLAGS='${CMAKE_C_FLAGS}'"
INSTALL_COMMAND ""
-21
View File
@@ -1,21 +0,0 @@
diff --git a/fat-arm64.c b/fat-arm64.c
index aec99f66..62b3adea 100644
--- a/fat-arm64.c
+++ b/fat-arm64.c
@@ -43,9 +43,14 @@
#if defined(__linux__) && defined(__GLIBC__) && defined(__GLIBC_PREREQ)
# if __GLIBC_PREREQ(2, 16)
# define USE_GETAUXVAL 1
-# include <asm/hwcap.h>
-# include <sys/auxv.h>
# endif
+#elif __ANDROID_API__ >= 18
+# define USE_GETAUXVAL 1
+#endif
+
+#if USE_GETAUXVAL
+# include <asm/hwcap.h>
+# include <sys/auxv.h>
#elif defined(__OpenBSD__)
# include <sys/sysctl.h>
# include <machine/cpu.h>