Ver código fonte

update cpuinfo (#6989)

* update cpuinfo

* fix windows arm64

* skip windows|arm64
apocelipes 5 meses atrás
pai
commit
b856d832a1
1 arquivos alterados com 5 adições e 1 exclusões
  1. 5 1
      packages/c/cpuinfo/xmake.lua

+ 5 - 1
packages/c/cpuinfo/xmake.lua

@@ -5,6 +5,7 @@ package("cpuinfo")
 
 
     add_urls("https://github.com/pytorch/cpuinfo.git")
     add_urls("https://github.com/pytorch/cpuinfo.git")
 
 
+    add_versions("2025.03.28", "39ea79a3c132f4e678695c579ea9353d2bd29968")
     add_versions("2024.09.26", "1e83a2fdd3102f65c6f1fb602c1b320486218a99")
     add_versions("2024.09.26", "1e83a2fdd3102f65c6f1fb602c1b320486218a99")
     add_versions("2023.07.21", "60480b7098c8ddc73d611285fc478dec66e4edf9")
     add_versions("2023.07.21", "60480b7098c8ddc73d611285fc478dec66e4edf9")
 
 
@@ -25,6 +26,9 @@ package("cpuinfo")
         import("core.tool.toolchain")
         import("core.tool.toolchain")
         import("core.base.semver")
         import("core.base.semver")
 
 
+        if package:version() and package:version():eq("2025.03.28") and package:is_arch("arm64") then
+            raise("cpuinfo v2025.03.28 does not support windows/arm64!")
+        end
         local msvc = toolchain.load("msvc", {plat = package:plat(), arch = package:arch()})
         local msvc = toolchain.load("msvc", {plat = package:plat(), arch = package:arch()})
         if msvc and package:is_arch("arm.*") then
         if msvc and package:is_arch("arm.*") then
             local vs_sdkver = msvc:config("vs_sdkver")
             local vs_sdkver = msvc:config("vs_sdkver")
@@ -57,7 +61,7 @@ package("cpuinfo")
         end
         end
 
 
         if package:is_plat("windows") then
         if package:is_plat("windows") then
-            table.insert(configs, "-DCPUINFO_RUNTIME_TYPE=" .. (package:config("vs_runtime"):startswith("MT") and "static" or "shared"))
+            table.insert(configs, "-DCPUINFO_RUNTIME_TYPE=default")
             local vs_sdkver = import("core.tool.toolchain").load("msvc"):config("vs_sdkver")
             local vs_sdkver = import("core.tool.toolchain").load("msvc"):config("vs_sdkver")
             if vs_sdkver then
             if vs_sdkver then
                 local build_ver = string.match(vs_sdkver, "%d+%.%d+%.(%d+)%.?%d*")
                 local build_ver = string.match(vs_sdkver, "%d+%.%d+%.(%d+)%.?%d*")