(gettext) add version 0.22.5 0.23.1 0.24.1 0.25 and fix libiconv (#7049)

packages/g/gettext/xmake.lua

@@ -9,13 +9,23 @@ package("gettext")
     add_versions("0.19.8-1", "105556dbc5c3fbbc2aa0edb46d22d055748b6f5c7cd7a8d99f8e7eb84e938be4")
     add_versions("0.21", "d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192")
     add_versions("0.21.1", "50dbc8f39797950aa2c98e939947c527e5ac9ebd2c1b99dd7b06ba33a6767ae6")
+    add_versions("0.22.5", "fe10c37353213d78a5b83d48af231e005c4da84db5ce88037d88355938259640")
+    add_versions("0.23.1", "c1f97a72a7385b7e71dd07b5fea6cdaf12c9b88b564976b23bd8c11857af2970")
+    add_versions("0.24.1", "6164ec7aa61653ac9cdfb41d5c2344563b21f707da1562712e48715f1d2052a6")
+    add_versions("0.25", "05240b29f5b0f422e5a4ef8e9b5f76d8fa059cc057693d2723cdb76f36a88ab0")
 
     if is_plat("macosx") then
-        add_deps("libiconv", {system = true})
         add_frameworks("CoreFoundation")
-    else
-        add_deps("libiconv")
     end
+    add_deps("libiconv")
+    
+    on_load(function(package)
+        if is_subhost("windows") then
+            -- get msys2 sh to avoid using git sh
+            local msystem = "MINGW" .. (package:is_arch64() and "64" or "32")
+            package:add("deps", "msys2", {configs = {msystem = msystem, base_devel = true, gcc =  true, make = true}})
+        end
+    end)
 
     on_install("macosx", "linux", "android", function (package)
         local configs = {"--disable-dependency-tracking",
@@ -42,35 +52,6 @@ package("gettext")
         if package:is_plat("macosx") then
             table.insert(configs, "--with-included-gettext")
         end
-        if package:is_plat("android") and package:version():le("0.20") then
-            io.replace("./gettext-tools/configure", "#define gid_t int", "")
-            io.replace("./gettext-tools/configure", "#define uid_t int", "")
-            io.replace("./gettext-runtime/configure", "#define gid_t int", "")
-            io.replace("./gettext-runtime/configure", "#define uid_t int", "")
-            io.replace("./gettext-tools/gnulib-lib/spawn.in.h", "@HAVE_SPAWN_H@", "0")
-            io.replace("./gettext-tools/gnulib-lib/spawn.in.h", "@HAVE_POSIX_SPAWNATTR_T@", "0")
-            io.replace("./gettext-tools/gnulib-lib/spawn.in.h", "@HAVE_POSIX_SPAWN_FILE_ACTIONS_T@", "0")
-            io.replace("./gettext-runtime/src/Makefile.in",
-                "bin_PROGRAMS = gettext$(EXEEXT) ngettext$(EXEEXT) envsubst$(EXEEXT)",
-                "bin_PROGRAMS =", {plain = true})
-            io.replace("./gettext-tools/src/Makefile.in",
-                "bin_PROGRAMS = .*noinst_PROGRAMS =",
-                "bin_PROGRAMS =\nnoinst_PROGRAMS =")
-            io.replace("./gettext-tools/src/Makefile.in",
-                "noinst_PROGRAMS = hostname$(EXEEXT) urlget$(EXEEXT) \\",
-                "bin_PROGRAMS =", {plain = true})
-            io.replace("./gettext-tools/src/Makefile.in",
-                "cldr-plurals$(EXEEXT)",
-                "", {plain = true})
-            io.replace("./gettext-tools/src/Makefile.in",
-                "install-exec-local:",
-                "install-exec-local: \n\ninstall-exec-local_: ", {plain = true})
-            io.replace("./gettext-tools/config.h.in", "#undef ICONV_CONST", "#define ICONV_CONST const")
-            io.replace("./gettext-runtime/config.h.in", "#undef ICONV_CONST", "#define ICONV_CONST const")
-            io.replace("./gettext-tools/libgrep/langinfo.in.h", "@HAVE_LANGINFO_H@", "0")
-            io.replace("./gettext-tools/gnulib-lib/langinfo.in.h", "@HAVE_LANGINFO_H@", "0")
-            io.replace("./gettext-runtime/gnulib-lib/langinfo.in.h", "@HAVE_LANGINFO_H@", "0")
-        end
         local cflags = {}
         local ldflags = {}
         for _, dep in ipairs(package:orderdeps()) do
@@ -87,7 +68,64 @@ package("gettext")
                 end
             end
         end
-        import("package.tools.autoconf").install(package, configs, {cflags = cflags, ldflags = ldflags})
+        import("package.tools.autoconf")
+        if package:is_plat("android") then
+            if package:version():le("0.20") then
+                io.replace("./gettext-tools/configure", "#define gid_t int", "")
+                io.replace("./gettext-tools/configure", "#define uid_t int", "")
+                io.replace("./gettext-runtime/configure", "#define gid_t int", "")
+                io.replace("./gettext-runtime/configure", "#define uid_t int", "")
+                io.replace("./gettext-tools/gnulib-lib/spawn.in.h", "@HAVE_SPAWN_H@", "0")
+                io.replace("./gettext-tools/gnulib-lib/spawn.in.h", "@HAVE_POSIX_SPAWNATTR_T@", "0")
+                io.replace("./gettext-tools/gnulib-lib/spawn.in.h", "@HAVE_POSIX_SPAWN_FILE_ACTIONS_T@", "0")
+                io.replace("./gettext-runtime/src/Makefile.in",
+                    "bin_PROGRAMS = gettext$(EXEEXT) ngettext$(EXEEXT) envsubst$(EXEEXT)",
+                    "bin_PROGRAMS =", {plain = true})
+                io.replace("./gettext-tools/src/Makefile.in",
+                    "bin_PROGRAMS = .*noinst_PROGRAMS =",
+                    "bin_PROGRAMS =\nnoinst_PROGRAMS =")
+                io.replace("./gettext-tools/src/Makefile.in",
+                    "noinst_PROGRAMS = hostname$(EXEEXT) urlget$(EXEEXT) \\",
+                    "bin_PROGRAMS =", {plain = true})
+                io.replace("./gettext-tools/src/Makefile.in",
+                    "cldr-plurals$(EXEEXT)",
+                    "", {plain = true})
+                io.replace("./gettext-tools/src/Makefile.in",
+                    "install-exec-local:",
+                    "install-exec-local: \n\ninstall-exec-local_: ", {plain = true})
+                io.replace("./gettext-tools/config.h.in", "#undef ICONV_CONST", "#define ICONV_CONST const")
+                io.replace("./gettext-runtime/config.h.in", "#undef ICONV_CONST", "#define ICONV_CONST const")
+                io.replace("./gettext-tools/libgrep/langinfo.in.h", "@HAVE_LANGINFO_H@", "0")
+                io.replace("./gettext-tools/gnulib-lib/langinfo.in.h", "@HAVE_LANGINFO_H@", "0")
+                io.replace("./gettext-runtime/gnulib-lib/langinfo.in.h", "@HAVE_LANGINFO_H@", "0")
+            end
+            if is_subhost("windows") then
+                import("core.base.option")
+                -- needed to avoid link errors to rpl_fputc, rpl_write, ...
+                -- rpl_* variants are enabled because SIGPIPE check fail, but i don't understand why, as i'm not very knowledgeable on msys2 and android, the fix is for now is this hack
+                for _, conffile in ipairs({"./configure", "./gettext-tools/configure", "./gettext-runtime/configure"}) do
+                    io.replace(conffile, "REPLACE_STDIO_WRITE_FUNCS=1", "REPLACE_STDIO_WRITE_FUNCS=0")
+                    io.replace(conffile, "REPLACE_WRITE=1", "REPLACE_WRITE=0")
+                end
+                local envs = os.joinenvs(autoconf.buildenvs(package, {cflags = cflags, ldflags = ldflags}), os.getenvs())
+                envs.SHELL = "sh"
+                autoconf.configure(package, configs, {envs = envs})
+
+                local njob = option.get("jobs") or tostring(os.default_njob())
+                local argv = {"-j" .. njob}
+                if option.get("verbose") then
+                    table.insert(argv, "V=1")
+                end
+                -- using execv instead of vrunv is needed when compiling on windows, otherwise it fail with
+                -- ../libtool: line 3331: 0: Bad file descriptor
+                -- when -v is not supplied to xmake
+                assert(os.execv("make", argv, {shell = true, envs = envs}))
+                assert(os.execv("make", table.join({"install"}, argv), {shell = true, envs = envs}))
+            end
+        end
+        if not is_subhost("windows") then
+            autoconf.install(package, configs, {cflags = cflags, ldflags = ldflags})
+        end
         package:addenv("PATH", "bin")
     end)
 

packages/l/libiconv/port/xmake.lua

@@ -222,13 +222,24 @@ target("iconv")
     if is_kind("shared") then
         add_defines("BUILDING_LIBICONV", "BUILDING_DLL", "DLL_EXPORT")
     end
+    -- relocatable.c doesn't exists anymore from >= 1.16
+    on_load(function (target)
+        import("core.base.semver")
+
+        local ver = semver.new(get_config("vers"))
+        if ver:ge("1.16") then
+            target:add("files", "lib/compat.c")
+        else
+            target:add("files", "lib/relocatable.c")
+        end
+    end)
     set_configdir(".")
     set_configvar("DLL_VARIABLE", (is_plat("windows") and is_kind("shared")) and "__declspec(dllimport)" or "")
     add_configfiles("(include/iconv.h.build.in)", {filename = "iconv.h", pattern = "@(.-)@", variables = {EILSEQ = ""}})
     add_configfiles("(include/iconv.h.in)", {filename = "iconv.h.inst", pattern = "@(.-)@", variables = {EILSEQ = ""}})
     add_configfiles("(config.h.in)", {filename = "config.h"})
     add_includedirs(".", "lib", "include", "libcharset/include", {public = true})
-    add_files("lib/iconv.c", "lib/relocatable.c", "libcharset/lib/localcharset.c")
+    add_files("lib/iconv.c", "libcharset/lib/localcharset.c")
     after_install(function (target)
         os.cp("include/iconv.h.inst", path.join(target:installdir(), "include", "iconv.h"))
         for _, name in ipairs(os.files("po/*.gmo")) do