Bläddra i källkod

fix openssl3/fetch (#3762)

* fix openssl3/fetch

* format code
ruki 1 år sedan
förälder
incheckning
7e0e8d4373
2 ändrade filer med 6 tillägg och 2 borttagningar
  1. 4 1
      packages/o/openssl3/fetch.lua
  2. 2 1
      packages/o/openssl3/xmake.lua

+ 4 - 1
packages/o/openssl3/fetch.lua

@@ -47,7 +47,10 @@ function _find_package_on_windows(package, opt)
     if openssl then
         local version = try {function () return os.iorunv(openssl, {"version"}) end}
         if version then
-            result.version = semver.match(version)
+            version = semver.match(version)
+            if version then
+                result.version = version:rawstr()
+            end
         end
     end
     return result

+ 2 - 1
packages/o/openssl3/xmake.lua

@@ -4,6 +4,7 @@ package("openssl3")
     set_license("Apache-2.0")
 
     add_urls("https://github.com/openssl/openssl/archive/refs/tags/openssl-$(version).zip")
+
     add_versions("3.0.7", "fcb37203c6bf7376cfd3aeb0be057937b7611e998b6c0d664abde928c8af3eb7")
     add_versions("3.0.6", "9b45be41df0d6e9cf9e340a64525177662f22808ac69aee6bfb29c511284dae4")
     add_versions("3.0.5", "4313c91fb0412e6a600493eb7c59bd555c4ff2ea7caa247a98c8456ad6f9fc74")
@@ -20,7 +21,7 @@ package("openssl3")
             package:add("deps", "nasm")
             -- the perl executable found in GitForWindows will fail to build OpenSSL
             -- see https://github.com/openssl/openssl/blob/master/NOTES-PERL.md#perl-on-windows
-            package:add("deps", "strawberry-perl", { system = false })
+            package:add("deps", "strawberry-perl", {system = false})
         end
 
         -- @note we must use package:is_plat() instead of is_plat in description for supporting add_deps("openssl", {host = true}) in python