Procházet zdrojové kódy

libidn2: add support for additional platforms (#6774)

* libunistring: update to 1.3

* libunistring: add support for additional platforms

* libunistring: Correct dependency to use shared `libiconv` for dynamic library build

* libidn2: add version 2.3.8

* libidn2: add support for additional platforms

* libidn2: Correct dependency to use shared `libunistring` for dynamic library build
Doekin před 5 měsíci
rodič
revize
7b8966425e

+ 8 - 4
packages/l/libidn2/xmake.lua

@@ -7,20 +7,24 @@ package("libidn2")
     add_urls("https://ftpmirror.gnu.org/gnu/libidn/libidn2-$(version).tar.gz",
              "https://ftp.gnu.org/gnu/libidn/libidn2-$(version).tar.gz")
     add_versions("2.3.2", "76940cd4e778e8093579a9d195b25fff5e936e9dc6242068528b437a76764f91")
+    add_versions("2.3.8", "f557911bf6171621e1f72ff35f5b1825bb35b52ed45325dcdee931e5d3c0787a")
 
-    add_deps("libunistring")
     if is_plat("linux") then
         add_extsources("apt::libidn2-dev", "pacman::libidn2")
     end
 
-    on_install("macosx", "linux", function (package)
-        local configs = {"--disable-dependency-tracking"}
+    on_load(function (package)
+        package:add("deps", "libunistring", "libiconv", { configs = {shared = package:config("shared")} })
+    end)
+
+    on_install("@!windows and !wasm", function (package)
+        local configs = {"--disable-dependency-tracking", "--disable-doc"}
         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:config("pic") ~= false then
             table.insert(configs, "--with-pic")
         end
-        import("package.tools.autoconf").install(package, configs, {packagedeps = {"libunistring"}})
+        import("package.tools.autoconf").install(package, configs, {packagedeps = {"libunistring", "libiconv"}})
     end)
 
     on_test(function (package)

+ 5 - 2
packages/l/libunistring/xmake.lua

@@ -8,10 +8,13 @@ package("libunistring")
              "https://ftp.gnu.org/gnu/libunistring/libunistring-$(version).tar.gz")
     add_versions("0.9.10", "a82e5b333339a88ea4608e4635479a1cfb2e01aafb925e1290b65710d43f610b")
     add_versions("1.1", "a2252beeec830ac444b9f68d6b38ad883db19919db35b52222cf827c385bdb6a")
+    add_versions("1.3", "8ea8ccf86c09dd801c8cac19878e804e54f707cf69884371130d20bde68386b7")
 
-    add_deps("libiconv")
+    on_load(function (package)
+        package:add("deps", "libiconv", { configs = {shared = package:config("shared")} })
+    end)
 
-    on_install("linux", "macosx", function (package)
+    on_install("@!windows and !wasm", function (package)
         local configs = {"--disable-dependency-tracking"}
         table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
         table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))