Prechádzať zdrojové kódy

Adding libcurl version 7.85, 7.86, 7.87 (#1698)

* Adding libcurl version 7.85, 7.86, 7.87

* Removing patch, change to version

* Reverting incorrect change

* Rolling back version add to just 7.85 to help in debugging where build break happened.

* Fixing bcrypt dependency

* Fixing package error

* Fixing mingw version check

* Fixing Bcrypt link

* Syntax error

* Fixing syntax error

* Fix version acces

* Fix links to syslinks and try to correct version check
Ian Bullard 2 rokov pred
rodič
commit
766154c780

+ 3 - 0
packages/l/libcurl/versions.lua

@@ -1,4 +1,7 @@
 function add_versions_list()
+    add_versions("7.87.0", "5d6e128761b7110946d1276aff6f0f266f2b726f5e619f7e0a057a474155f307")
+    add_versions("7.86.0", "f5ca69db03eea17fa8705bdfb1a9f58d76a46c9010518109bb38f313137e0a28")
+    add_versions("7.85.0", "21a7e83628ee96164ac2b36ff6bf99d467c7b0b621c1f7e317d8f0d96011539c")
     add_versions("7.84.0", "702fb26e73190a3bd77071aa146f507b9817cc4dfce218d2ab87f00cd3bc059d")
     add_versions("7.82.0", "46d9a0400a33408fd992770b04a44a7434b3036f2e8089ac28b57573d59d371f")
     add_versions("7.81.0", "1e7a38d7018ec060f1f16df839854f0889e94e122c4cfa5d3a37c2dc56f1e258")

+ 11 - 0
packages/l/libcurl/xmake.lua

@@ -71,6 +71,11 @@ package("libcurl")
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         table.insert(configs, (package:version():ge("7.80") and "-DCURL_USE_SCHANNEL=ON" or "-DCMAKE_USE_SCHANNEL=ON"))
         local version = package:version()
+
+        if (package:is_plat("mingw") and version:ge("7.85")) then
+            package:add("syslinks", "Bcrypt")
+        end
+            
         local configopts = {cares    = "ENABLE_ARES",
                             openssl  = (version:ge("7.81") and "CURL_USE_OPENSSL" or "CMAKE_USE_OPENSSL"),
                             mbedtls  = (version:ge("7.81") and "CURL_USE_MBEDTLS" or "CMAKE_USE_MBEDTLS"),
@@ -102,6 +107,12 @@ package("libcurl")
                          "--without-quiche",
                          "--without-ngtcp2",
                          "--without-nghttp3"}
+
+        local version = package:version()
+        if (package:is_plat("mingw") and version:ge("7.85")) then
+            package:add("syslinks", "Bcrypt")
+        end
+                
         table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
         table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
         if package:debug() then