diff --git a/packages/l/libzip/xmake.lua b/packages/l/libzip/xmake.lua index 930041682d4..8eed9351ffa 100644 --- a/packages/l/libzip/xmake.lua +++ b/packages/l/libzip/xmake.lua @@ -30,7 +30,7 @@ package("libzip") end if is_plat("windows", "mingw") then - add_syslinks("advapi32") + add_syslinks("advapi32", "bcrypt") end if on_check then diff --git a/packages/l/libzippp/xmake.lua b/packages/l/libzippp/xmake.lua index 38c1079e081..2b73b14e453 100644 --- a/packages/l/libzippp/xmake.lua +++ b/packages/l/libzippp/xmake.lua @@ -20,6 +20,15 @@ package("libzippp") add_deps("cmake") + if on_check then + on_check("android", function (package) + if package:is_arch("armeabi-v7a") then + local ndkver = package:toolchain("ndk"):config("ndkver") + assert(ndkver and tonumber(ndkver) > 22, "package(libzip) require ndk version > 22") + end + end) + end + on_load(function (package) package:add("deps", "libzip v" .. libzip_version_map[package:version_str()]) if package:config("encryption") then @@ -27,7 +36,7 @@ package("libzippp") end end) - on_install(function (package) + on_install("!cross", function (package) local configs = { "-DLIBZIPPP_BUILD_TESTS=OFF", "-DLIBZIPPP_CMAKE_CONFIG_MODE=ON",