diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt index bb3f3580f..fc91db200 100644 --- a/app/src/main/cpp/CMakeLists.txt +++ b/app/src/main/cpp/CMakeLists.txt @@ -44,8 +44,9 @@ 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.10.tar.gz - URL_MD5 c61453139d5fb44e9cdcc5b684b26e55 + GIT_REPOSITORY https://gitlab.com/gnutls/nettle.git + GIT_TAG nettle_3.10_release_20240616 + GIT_CONFIG core.autocrlf=input 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/configure_nettle.sh b/app/src/main/cpp/configure_nettle.sh index dd777a949..feffbf18e 100644 --- a/app/src/main/cpp/configure_nettle.sh +++ b/app/src/main/cpp/configure_nettle.sh @@ -7,7 +7,7 @@ else TOOLCHAIN=$ARCH_NDK_LOCATION fi TARGET=$2 -./configure --host=$TARGET --disable-public-key --disable-dependency-tracking \ +./.bootstrap && ./configure --host=$TARGET --disable-public-key --disable-dependency-tracking \ AR=$TOOLCHAIN/llvm-ar \ CC="$TOOLCHAIN/clang -target $TARGET" \ RANLIB=$TOOLCHAIN/llvm-ranlib diff --git a/renovate.json b/renovate.json index 1872f2548..198c779bd 100644 --- a/renovate.json +++ b/renovate.json @@ -6,6 +6,18 @@ "ignorePaths": [ "app/build.gradle.kts" ], + "customManagers": [ + { + "customType": "regex", + "fileMatch": [ + "(^|/)CMakeLists\\.txt$" + ], + "matchStrings": [ + "(?\\S*)\\s*GIT_REPOSITORY https://(?.*?)\\.com/(?.*?)\\.git\\s*GIT_TAG (?\\S*)" + ], + "datasourceTemplate": "{{{datasource}}}-tags" + } + ], "packageRules": [ { "description": "Disable updates for SNAPSHOTs", @@ -36,6 +48,12 @@ "https://github.com/google/ksp" ], "recreateWhen": "never" + }, + { + "matchDepNames": [ + "nettle" + ], + "versioning": "regex:^nettle_(?\\d+)\\.(?\\d+)(?:\\.(?\\d+))?(?rc\\d+)?" } ], "lockFileMaintenance": {