Skip to content

Commit 7b89664

Browse files
authored
libidn2: add support for additional platforms (xmake-io#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
1 parent 68077d2 commit 7b89664

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

packages/l/libidn2/xmake.lua

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,24 @@ package("libidn2")
77
add_urls("https://ftpmirror.gnu.org/gnu/libidn/libidn2-$(version).tar.gz",
88
"https://ftp.gnu.org/gnu/libidn/libidn2-$(version).tar.gz")
99
add_versions("2.3.2", "76940cd4e778e8093579a9d195b25fff5e936e9dc6242068528b437a76764f91")
10+
add_versions("2.3.8", "f557911bf6171621e1f72ff35f5b1825bb35b52ed45325dcdee931e5d3c0787a")
1011

11-
add_deps("libunistring")
1212
if is_plat("linux") then
1313
add_extsources("apt::libidn2-dev", "pacman::libidn2")
1414
end
1515

16-
on_install("macosx", "linux", function (package)
17-
local configs = {"--disable-dependency-tracking"}
16+
on_load(function (package)
17+
package:add("deps", "libunistring", "libiconv", { configs = {shared = package:config("shared")} })
18+
end)
19+
20+
on_install("@!windows and !wasm", function (package)
21+
local configs = {"--disable-dependency-tracking", "--disable-doc"}
1822
table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
1923
table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
2024
if package:config("pic") ~= false then
2125
table.insert(configs, "--with-pic")
2226
end
23-
import("package.tools.autoconf").install(package, configs, {packagedeps = {"libunistring"}})
27+
import("package.tools.autoconf").install(package, configs, {packagedeps = {"libunistring", "libiconv"}})
2428
end)
2529

2630
on_test(function (package)

packages/l/libunistring/xmake.lua

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@ package("libunistring")
88
"https://ftp.gnu.org/gnu/libunistring/libunistring-$(version).tar.gz")
99
add_versions("0.9.10", "a82e5b333339a88ea4608e4635479a1cfb2e01aafb925e1290b65710d43f610b")
1010
add_versions("1.1", "a2252beeec830ac444b9f68d6b38ad883db19919db35b52222cf827c385bdb6a")
11+
add_versions("1.3", "8ea8ccf86c09dd801c8cac19878e804e54f707cf69884371130d20bde68386b7")
1112

12-
add_deps("libiconv")
13+
on_load(function (package)
14+
package:add("deps", "libiconv", { configs = {shared = package:config("shared")} })
15+
end)
1316

14-
on_install("linux", "macosx", function (package)
17+
on_install("@!windows and !wasm", function (package)
1518
local configs = {"--disable-dependency-tracking"}
1619
table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
1720
table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))

0 commit comments

Comments
 (0)