diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt index 135926ed4..9b68e2711 100644 --- a/app/src/main/cpp/CMakeLists.txt +++ b/app/src/main/cpp/CMakeLists.txt @@ -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 "" diff --git a/app/src/main/cpp/nettle.patch b/app/src/main/cpp/nettle.patch deleted file mode 100644 index 30f201095..000000000 --- a/app/src/main/cpp/nettle.patch +++ /dev/null @@ -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 --# include - # endif -+#elif __ANDROID_API__ >= 18 -+# define USE_GETAUXVAL 1 -+#endif -+ -+#if USE_GETAUXVAL -+# include -+# include - #elif defined(__OpenBSD__) - # include - # include