improve fontconfig (#159)

packages/b/bzip2/xmake.lua

@@ -14,14 +14,18 @@ package("bzip2")
 
     on_install("windows", function (package)
         io.gsub("makefile.msc", "%-MD", "-" .. package:config("vs_runtime"))
-        os.vrunv("nmake", {"-f", "makefile.msc"})
+        import("package.tools.nmake").build(package, {"-f", "makefile.msc", "bzip2"})
         os.cp("libbz2.lib", package:installdir("lib"))
         os.cp("*.h", package:installdir("include"))
         os.cp("*.exe", package:installdir("bin"))
     end)
 
     on_install("macosx", "linux", function (package)
-        os.vrunv("make", {"install", "PREFIX=" .. package:installdir()})
+        local configs = {"PREFIX=" .. package:installdir()}
+        if package:config("shared") then
+            table.insert(configs, "CFLAGS=-fPIC")
+        end
+        import("package.tools.make").install(package, configs)
     end)
 
     on_test(function (package)

packages/f/fontconfig/xmake.lua

@@ -7,7 +7,9 @@ package("fontconfig")
     add_versions("2.13.1", "9f0d852b39d75fc655f9f53850eb32555394f36104a044bb2b2fc9e66dbbfa7f")
 
     add_deps("pkg-config", "freetype >= 2.9", "expat")
-    if not is_plat("macosx") then
+    if is_plat("macosx") then
+        add_deps("gettext")
+    else
         add_deps("autoconf", "automake", "libtool", "gperf", "bzip2")
         add_deps("util-linux", {configs = {libuuid = true}})
     end
@@ -17,6 +19,7 @@ package("fontconfig")
                           "2abdff214b99f2d074170e6512b0149cc858ea26cd930690aa6b4ccea2c549ef")
 
     on_install("linux", "macosx", function (package)
+        import("package.tools.autoconf")
         local font_dirs = {}
         if is_plat("macosx") then
             table.insert(font_dirs, "/System/Library/Fonts")
@@ -27,8 +30,12 @@ package("fontconfig")
         if #font_dirs > 0 then
             table.insert(configs, "--with-add-fonts=" .. table.concat(font_dirs, ','))
         end
+        local envs = autoconf.buildenvs(package)
+        if package:is_plat("linux") then
+            envs.UUID_CFLAGS = "-I" .. package:dep("util-linux"):installdir("include")
+        end
         table.insert(configs, "--enable-shared=no")
-        import("package.tools.autoconf").install(package, configs)
+        autoconf.install(package, configs, {envs = envs})
     end)
 
     on_test(function (package)

packages/l/libpng/xmake.lua

@@ -8,6 +8,7 @@ package("libpng")
     add_versions("v1.6.36", "6274d3f761cc80f7f6e2cde6c07bed10c00bc4ddd24c4f86e25eb51affa1664d")
     add_versions("v1.6.35", "3d22d46c566b1761a0e15ea397589b3a5f36ac09b7c785382e6470156c04247f")
     add_versions("v1.6.34", "7ffa5eb8f9f3ed23cf107042e5fec28699718916668bbce48b968600475208d3")
+    set_license("libpng-2.0")
 
     add_deps("zlib")
     if is_host("windows") then