diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt index 015e83398..e5abf118c 100644 --- a/app/src/main/cpp/CMakeLists.txt +++ b/app/src/main/cpp/CMakeLists.txt @@ -47,7 +47,7 @@ if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") else () set(TOOLCHAIN "${ANDROID_TOOLCHAIN_ROOT}/bin") endif () -set(CONFIGURE_COMMAND ./configure --disable-public-key --disable-dependency-tracking +set(CONFIGURE_COMMAND ./.bootstrap && ./configure --disable-public-key --disable-dependency-tracking "--host=${CMAKE_C_COMPILER_TARGET}" "CFLAGS=${CMAKE_C_FLAGS} -Qunused-arguments" "AR=${TOOLCHAIN}/llvm-ar" @@ -56,8 +56,10 @@ set(CONFIGURE_COMMAND ./configure --disable-public-key --disable-dependency-trac ) ExternalProject_Add( nettle - URL https://ftpmirror.gnu.org/nettle/nettle-3.10.2.tar.gz - URL_MD5 b28bcbf6f045ff007940a9401673600d + GIT_REPOSITORY https://gitlab.com/gnutls/nettle.git + GIT_TAG nettle_3.10.2_release_20250626 + GIT_SHALLOW 1 + GIT_CONFIG core.autocrlf=input CONFIGURE_COMMAND ${WSL} ${CONFIGURE_COMMAND} BUILD_COMMAND ${WSL} make -j4 libnettle.a INSTALL_COMMAND "" diff --git a/renovate.json b/renovate.json index 8aefd5d7c..01f8f2523 100644 --- a/renovate.json +++ b/renovate.json @@ -17,17 +17,6 @@ ], "datasourceTemplate": "{{datasource}}-tags" }, - { - "customType": "regex", - "managerFilePatterns": [ - "/(^|/)CMakeLists\\.txt$/" - ], - "matchStrings": [ - "(/(?[^/]+)){2}-(?.+)\\.tar\\.gz" - ], - "datasourceTemplate": "custom.gnu", - "extractVersionTemplate": "{{depName}}-(?.+)\\.tar\\.gz$" - }, { "customType": "regex", "managerFilePatterns": [ @@ -62,10 +51,6 @@ "transformTemplates": [ "{\"releases\":[{\"version\":$match(body,/ndkVersion \"([^\"]+)\"/).groups[0]}],\"changelogUrl\":html_url}" ] - }, - "gnu": { - "defaultRegistryUrlTemplate": "https://ftpmirror.gnu.org/{{packageName}}/", - "format": "html" } }, "packageRules": [ @@ -91,6 +76,12 @@ ], "allowedVersions": "!/compat$/" }, + { + "matchDepNames": [ + "nettle" + ], + "versioning": "regex:^nettle_(?\\d+)\\.(?\\d+)(?:\\.(?\\d+))?(?rc\\d+)?" + }, { "matchDepNames": [ "rust-nightly"