Forráskód Böngészése

mariadb-connector-c: fix build (#8328)

* mariadb-connector-c: fix build

* let windows default use schannel
apocelipes 2 hónapja
szülő
commit
00c962eeeb
1 módosított fájl, 24 hozzáadás és 7 törlés
  1. 24 7
      packages/m/mariadb-connector-c/xmake.lua

+ 24 - 7
packages/m/mariadb-connector-c/xmake.lua

@@ -5,6 +5,7 @@ package("mariadb-connector-c")
 
 
     add_urls("https://github.com/mariadb-corporation/mariadb-connector-c/archive/refs/tags/v$(version).tar.gz")
     add_urls("https://github.com/mariadb-corporation/mariadb-connector-c/archive/refs/tags/v$(version).tar.gz")
 
 
+    add_versions("3.4.7", "cf81cd1c71c3199da9d2125aee840cb6083d43e1ea4c60c4be5045bfc7824eba")
     add_versions("3.3.9", "062b9ec5c26cbb236a78f0ba26981272053f59bdfc113040bab904a9da36d31f")
     add_versions("3.3.9", "062b9ec5c26cbb236a78f0ba26981272053f59bdfc113040bab904a9da36d31f")
     add_versions("3.3.4", "ea6a23850d6a2f6f2e0d9e9fdb7d94fe905a4317f73842272cf121ed25903e1f")
     add_versions("3.3.4", "ea6a23850d6a2f6f2e0d9e9fdb7d94fe905a4317f73842272cf121ed25903e1f")
     add_versions("3.1.13", "361136e9c365259397190109d50f8b6a65c628177792273b4acdb6978942b5e7")
     add_versions("3.1.13", "361136e9c365259397190109d50f8b6a65c628177792273b4acdb6978942b5e7")
@@ -24,7 +25,9 @@ package("mariadb-connector-c")
         add_configs("mysqlcompat", {description = "Creates libmysql* symbolic links.", default = false, type = "boolean"})
         add_configs("mysqlcompat", {description = "Creates libmysql* symbolic links.", default = false, type = "boolean"})
     end
     end
 
 
-    add_configs("ssl", {description = "Enables use of TLS/SSL library.", default = not is_plat("bsd"), type = "boolean", readonly = is_plat("bsd")})
+    local ssl_default_value = is_plat("windows") and "schannel" or "openssl"
+    local ssl_values = is_plat("windows") and {"openssl", "openssl3", "gnutls", "schannel"} or {"openssl", "openssl3", "gnutls"}
+    add_configs("ssl", {description = "Enables use of TLS/SSL library.", default = ssl_default_value, type = "string", readonly = is_plat("bsd"), values = ssl_values})
     add_configs("dyncol", {description = "Enables support of dynamic columns.", default = true, type = "boolean"})
     add_configs("dyncol", {description = "Enables support of dynamic columns.", default = true, type = "boolean"})
     add_configs("curl", {description = "Enables use of curl.", default = true, type = "boolean"})
     add_configs("curl", {description = "Enables use of curl.", default = true, type = "boolean"})
     add_configs("external_zlib", {description = "Enables use of external zlib.", default = false, type = "boolean"})
     add_configs("external_zlib", {description = "Enables use of external zlib.", default = false, type = "boolean"})
@@ -44,25 +47,39 @@ package("mariadb-connector-c")
             end
             end
         end
         end
 
 
-        local configdeps = {external_zlib  = "zlib",
-                            ssl            = "openssl"}
+        local configdeps = {external_zlib  = "zlib"}
         for name, dep in pairs(configdeps) do
         for name, dep in pairs(configdeps) do
             if package:config(name) then
             if package:config(name) then
                 package:add("deps", dep)
                 package:add("deps", dep)
             end
             end
         end
         end
+
+        local ssl = package:config("ssl")
+        if ssl == "schannel" then
+            package:add("syslinks", "secur32", "crypt32", "bcrypt", "advapi32", "iphlpapi", "ws2_32")
+        else
+            package:add("deps", ssl)
+        end
     end)
     end)
 
 
     on_install("bsd", "linux", "windows", function(package)
     on_install("bsd", "linux", "windows", function(package)
         io.replace("CMakeLists.txt", "-Werror", "", {plain = true})
         io.replace("CMakeLists.txt", "-Werror", "", {plain = true})
         local configs = {"-DCMAKE_C_STANDARD=99"}
         local configs = {"-DCMAKE_C_STANDARD=99"}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
-        for name, enabled in pairs(package:configs()) do
+
+        local openssl = package:dep("openssl") or package:dep("openssl3")
+        if openssl then
+            if not openssl:is_system() then
+                table.insert(configs, "-DOPENSSL_ROOT_DIR=" .. openssl:installdir())
+            end
+        end
+
+        for name, value in pairs(package:configs()) do
             if not package:extraconf("configs", name, "builtin") then
             if not package:extraconf("configs", name, "builtin") then
-                if enabled then
-                    table.insert(configs, "-DWITH_" .. name:upper() .. "=ON")
+                if name == "ssl" then
+                    table.insert(configs, "-DWITH_SSL=" .. value:upper())
                 else
                 else
-                    table.insert(configs, "-DWITH_" .. name:upper() .. "=OFF")
+                    table.insert(configs, "-DWITH_" .. name:upper() .. (value and "=ON" or "=OFF"))
                 end
                 end
             end
             end
         end
         end