Browse Source

Auto-update aws-checksums to v0.1.20 (#5295)

* Update aws-checksums to v0.1.20

* patch android r27 cmake

* try to fix mingw i386

* Revert "try to fix mingw i386"

This reverts commit 7b49df91aa3dade4b0e2ab99265213579adef9ab.

---------

Co-authored-by: star9029 <[email protected]>
ruki 11 months ago
parent
commit
c2c62d5fc5
1 changed files with 20 additions and 8 deletions
  1. 20 8
      packages/a/aws-checksums/xmake.lua

+ 20 - 8
packages/a/aws-checksums/xmake.lua

@@ -6,22 +6,26 @@ package("aws-checksums")
     add_urls("https://github.com/awslabs/aws-checksums/archive/refs/tags/$(version).tar.gz",
              "https://github.com/awslabs/aws-checksums.git")
 
+    add_versions("v0.1.20", "12f80085993662b6d2cbd2d090b49b4350d19396b1d218d52323712cc8dee252")
     add_versions("v0.1.19", "844e5a4f659f454112c559d4f4043b7accfbb134e47a55f4c55f79d9c71bdab1")
     add_versions("v0.1.18", "bdba9d0a8b8330a89c6b8cbc00b9aa14f403d3449b37ff2e0d96d62a7301b2ee")
     add_versions("v0.1.17", "83c1fbae826631361a529e9565e64a942c412baaec6b705ae5da3f056b97b958")
 
-    add_configs("asan", {description = "Enable Address Sanitize.", 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", "aws-c-common")
 
     if on_check then
         on_check(function (package)
+            if package:version():ge("0.1.19") then
+                if package:is_plat("windows") and package:has_tool("cxx", "clang_cl") then
+                    raise("package(aws-checksums >=0.1.19) unsupported clang-cl toolchain")
+                end
+            end
             if package:version():eq("0.1.19") then
-                if package:is_plat("windows") then
-                    if package:has_tool("cxx", "clang_cl") then
-                        raise("package(aws-checksums 0.1.19) unsupported clang-cl toolchain")
-                    end
-                elseif package:has_tool("cxx", "clang") then
+                if not package:is_plat("windows") and package:has_tool("cxx", "clang") then
                     raise("package(aws-checksums 0.1.19) unsupported clang toolchain")
                 end
             end
@@ -29,12 +33,20 @@ package("aws-checksums")
     end
 
     on_install("!mingw or mingw|!i386", function (package)
-        local cmakedir = package:dep("aws-c-common"):installdir("lib", "cmake")
+        if package:is_plat("windows") and package:config("shared") then
+            package:add("defines", "AWS_CHECKSUMS_USE_IMPORT_EXPORT")
+        end
+
+        local cmakedir = package:dep("aws-c-common"):installdir("lib/cmake")
         if is_host("windows") then
             cmakedir = cmakedir:gsub("\\", "/")
         end
 
-        local configs = {"-DBUILD_TESTING=OFF", "-DCMAKE_MODULE_PATH=" .. cmakedir}
+        local configs = {
+            "-DBUILD_TESTING=OFF",
+            "-DCMAKE_POLICY_DEFAULT_CMP0057=NEW",
+            "-DCMAKE_MODULE_PATH=" .. cmakedir,
+        }
         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"))
         table.insert(configs, "-DENABLE_SANITIZERS=" .. (package:config("asan") and "ON" or "OFF"))