improve glib

packages/g/gettext/xmake.lua

@@ -9,7 +9,8 @@ package("gettext")
     add_versions("0.19.8-1", "105556dbc5c3fbbc2aa0edb46d22d055748b6f5c7cd7a8d99f8e7eb84e938be4")
 
     if is_plat("macosx") then
-        add_links("iconv")
+        add_syslinks("iconv")
+        add_frameworks("CoreFoundation")
     else
         add_deps("libiconv")
     end

packages/g/glib/xmake.lua

@@ -7,16 +7,23 @@ package("glib")
              {version = function (version) return table.concat(table.slice((version):split('%.'), 1, 2), '.') .. "/glib-" .. version end})
     add_versions("2.60.2", "2ef15475060addfda0443a7e8a52b28a10d5e981e82c083034061daf9a8f80d9")
 
-    add_deps("meson", "ninja", "gettext", "libiconv", "libffi", "pcre")
+    add_deps("meson", "ninja", "libffi", "pcre")
+    if not is_plat("macosx") then
+        add_deps("libiconv")
+    end
 
     add_includedirs("include/glib-2.0", "lib/glib-2.0/include")
-    add_links("glib-2.0", "gio-2.0", "gobject-2.0", "gthread-2.0", "gmodule-2.0")
+    add_links("glib-2.0", "gio-2.0", "gobject-2.0", "gthread-2.0", "gmodule-2.0", "intl")
     if is_plat("macosx") then
+        add_syslinks("iconv")
         add_frameworks("Foundation", "CoreFoundation")
     end
 
     on_install("macosx", "linux", function (package)
         local configs = {"-Dbsymbolic_functions=false", "-Ddtrace=false", "-Ddefault_library=static"}
+        if is_plat("macosx") then
+            table.insert(configs, "-Diconv=native")
+        end
         table.insert(configs, "-Dgio_module_dir=" .. path.join(package:installdir(), "lib/gio/modules"))
         import("package.tools.meson").install(package, configs)
     end)