From 1c58b22400e9ab0364d40211d00ff74ff13a7d8b Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 12 Oct 2022 11:10:33 +0800 Subject: [PATCH] improve mingw for libiconv (#1523) --- packages/l/libiconv/xmake.lua | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/l/libiconv/xmake.lua b/packages/l/libiconv/xmake.lua index c9a5fdd52..408547145 100644 --- a/packages/l/libiconv/xmake.lua +++ b/packages/l/libiconv/xmake.lua @@ -26,7 +26,7 @@ package("libiconv") package:addenv("PATH", "bin") end) - on_install("windows", function (package) + on_install("windows", "mingw", function (package) io.gsub("config.h.in", "%$", "") io.gsub("config.h.in", "# ?undef (.-)\n", "${define %1}\n") io.gsub("libcharset/config.h.in", "%$", "") @@ -41,7 +41,7 @@ package("libiconv") }) end) - on_install("macosx", "linux", "cross", "android", "mingw@msys", function (package) + on_install("macosx", "linux", "cross", "android", function (package) local configs = {"--disable-dependency-tracking", "--enable-extra-encodings"} if not package:is_plat("macosx") then table.insert(configs, "--enable-relocatable") @@ -51,9 +51,6 @@ package("libiconv") if package:debug() then table.insert(configs, "--enable-debug") end - if package:config("pic") ~= false then - table.insert(configs, "--with-pic") - end if package:is_plat("android") then io.replace("./configure", "#define gid_t int", "") io.replace("./configure", "#define uid_t int", "")