From ab08b3393cdf9ab2e05a05b4cc5f9fa17b9ad9f2 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 16 Feb 2025 23:05:27 +0800 Subject: [PATCH] Auto-update aws-lc to v1.45.0 (#6364) * Update aws-lc to v1.45.0 * Update xmake.lua * Update xmake.lua * Update xmake.lua * Fix wasm * Update xmake.lua --------- Co-authored-by: star9029 --- packages/a/aws-lc/xmake.lua | 39 ++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/packages/a/aws-lc/xmake.lua b/packages/a/aws-lc/xmake.lua index b4214f59c..c2c0cb02b 100644 --- a/packages/a/aws-lc/xmake.lua +++ b/packages/a/aws-lc/xmake.lua @@ -5,6 +5,7 @@ package("aws-lc") add_urls("https://github.com/aws/aws-lc/archive/refs/tags/$(version).tar.gz", "https://github.com/aws/aws-lc.git") + add_versions("v1.45.0", "b136d4331583e16dbcb0c501d56e80afbe5ea1314a4a1c89056953d76e37e9fc") add_versions("v1.41.1", "c81376005466339564c3ca5ad83c52ca350f79391414999d052b5629d008a4d6") add_versions("v1.40.0", "5397a2fdb60230912dae4d7aeb3847c6b39a2f820504abbf55e376ed6a175a55") add_versions("v1.39.0", "37f5a379081b97adba3e1316017e09484d6c4ed6dc336d57fae6f0b7b27472fc") @@ -16,7 +17,10 @@ package("aws-lc") add_configs("go", {description = "Enable go", default = false, type = "boolean"}) add_configs("perl", {description = "Enable perl", default = false, type = "boolean"}) add_configs("tools", {description = "Build tools", default = false, type = "boolean"}) - + if is_plat("wasm") then + add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) + end + add_deps("cmake") if is_plat("windows", "mingw") or is_host("windows") then add_deps("nasm") @@ -30,26 +34,39 @@ package("aws-lc") add_syslinks("pthread", "dl", "m") end + if on_check then + on_check("wasm", function (target) + if package:version() and package:version():eq("1.45.0") then + raise("package(aws-lc 1.45.0) unsupported version") + end + end) + end + on_load(function (package) - if package:config("go") then - package:add("deps", "go") - end - if package:config("perl") and package:is_plat() and (not package:is_precompiled()) then - package:add("deps", "strawberry-perl") + if not package:is_precompiled() then + if package:config("go") then + package:add("deps", "go") + end + if is_subhost("windows") and package:config("perl") then + package:add("deps", "strawberry-perl") + end end - end) - on_install("!cross and windows|!arm64", function (package) if package:config("shared") and package:is_plat("windows") then package:add("defines", "BORINGSSL_SHARED_LIBRARY") end + end) + + on_install("!cross and (!windows or windows|!arm64)", function (package) + io.replace("CMakeLists.txt", "-WX", "", {plain = true}) + io.replace("CMakeLists.txt", [[set(C_CXX_FLAGS "${C_CXX_FLAGS} -Werror -Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings")]], "", {plain = true}) local configs = { "-DBUILD_TESTING=OFF", + "-DCMAKE_POLICY_DEFAULT_CMP0057=NEW", "-DCMAKE_INSTALL_INCLUDEDIR=include", "-DBUILD_LIBSSL=ON", } - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) @@ -57,6 +74,10 @@ package("aws-lc") table.insert(configs, "-DDISABLE_GO=" .. (package:config("go") and "OFF" or "ON")) table.insert(configs, "-DDISABLE_PERL=" .. (package:config("perl") and "OFF" or "ON")) table.insert(configs, "-DBUILD_TOOL=" .. (package:config("tools") and "ON" or "OFF")) + + if package:is_plat("mingw") and not package:is_arch64() then + table.insert(configs, "-DOPENSSL_NO_ASM=ON") + end import("package.tools.cmake").install(package, configs) end)