improve xz pcre

PKGLIST.md

@@ -2,38 +2,38 @@
 
 |linux|windows|mingw|iphoneos|macosx|android|
 |-----|-------|-----|--------|------|-------|
-|boost|boost|bullet3|bullet3|autoconf|bullet3||
-|bullet3|bullet3|catch2|catch2|automake|catch2||
-|bzip2|bzip2|concurrentqueue|cjson|boost|cjson||
-|cairo|cairo|cpp-taskflow|concurrentqueue|bullet3|concurrentqueue||
-|catch2|catch2|doctest|cpp-taskflow|bzip2|cpp-taskflow||
-|cjson|concurrentqueue|gtest|doctest|cairo|doctest||
-|concurrentqueue|cpp-taskflow|nlohmann_json|gtest|catch2|gtest||
-|cpp-taskflow|doctest|spdlog|json-c|cjson|json-c||
-|doctest|expat|tbox|libcurl|cmake|libjpeg||
-|expat|fmt|zlib|libev|concurrentqueue|libpng||
-|ffmpeg|freeglut||libffi|cpp-taskflow|libuv||
-|fmt|freetype||libjpeg|doctest|libxml2||
-|fontconfig|glew||libpng|expat|lua||
-|freeglut|go||libuv|ffmpeg|nlohmann_json||
-|freetype|gtest||libxml2|fmt|spdlog||
-|gettext|libcurl||nlohmann_json|fontconfig|tbox||
-|glew|libjpeg||spdlog|freetype|zlib||
-|glib|libpng||tbox|gettext|||
-|go|libsdl||zlib|glew|||
-|gperf|libuv|||glib|||
-|gtest|lua|||go|||
-|icu4c|luajit|||gperf|||
-|json-c|nlohmann_json|||gtest|||
-|libcurl|pcre|||icu4c|||
-|libev|pixman|||json-c|||
-|libffi|protobuf-c|||libcurl|||
-|libiconv|protobuf-cpp|||libev|||
-|libjpeg|skia|||libffi|||
-|libmill|spdlog|||libiconv|||
-|libpng|sqlite3|||libjpeg|||
-|libsdl|tbox|||libmill|||
-|libtask|zlib|||libpng|||
+|boost|boost|catch2|catch2|autoconf|catch2||
+|bullet3|bzip2|concurrentqueue|cjson|automake|cjson||
+|bzip2|cairo|cpp-taskflow|concurrentqueue|boost|concurrentqueue||
+|cairo|catch2|doctest|cpp-taskflow|bullet3|cpp-taskflow||
+|catch2|concurrentqueue|gtest|doctest|bzip2|doctest||
+|cjson|cpp-taskflow|nlohmann_json|gtest|cairo|gtest||
+|concurrentqueue|doctest|pcre|json-c|catch2|json-c||
+|cpp-taskflow|expat|pcre2|libcurl|cjson|libjpeg||
+|doctest|fmt|spdlog|libev|cmake|libpng||
+|expat|freeglut|tbox|libffi|concurrentqueue|libuv||
+|ffmpeg|freetype|xz|libjpeg|cpp-taskflow|libxml2||
+|fmt|glew|zlib|libpng|doctest|lua||
+|fontconfig|go||libuv|expat|nlohmann_json||
+|freeglut|gtest||libxml2|ffmpeg|spdlog||
+|freetype|libcurl||nlohmann_json|fmt|tbox||
+|gettext|libjpeg||spdlog|fontconfig|zlib||
+|glew|libpng||tbox|freetype|||
+|glib|libsdl||zlib|gettext|||
+|go|libuv|||glew|||
+|gperf|lua|||glib|||
+|gtest|luajit|||go|||
+|icu4c|nlohmann_json|||gperf|||
+|json-c|pcre|||gtest|||
+|libcurl|pixman|||icu4c|||
+|libev|protobuf-c|||json-c|||
+|libffi|protobuf-cpp|||libcurl|||
+|libiconv|skia|||libev|||
+|libjpeg|spdlog|||libffi|||
+|libmill|sqlite3|||libiconv|||
+|libpng|tbox|||libjpeg|||
+|libsdl|zlib|||libmill|||
+|libtask||||libpng|||
 |libuv||||libsdl|||
 |libxml2||||libtask|||
 |lua||||libtool|||

packages/b/bullet3/xmake.lua

@@ -9,7 +9,7 @@ package("bullet3")
 
     add_deps("cmake")
 
-    on_install("macosx", "linux", "windows", function (package)
+    on_install("macosx", "linux", function (package)
         local configs = {"-DBUILD_CPU_DEMOS=OFF"}
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))

packages/p/pcre/xmake.lua

@@ -39,7 +39,7 @@ package("pcre")
         import("package.tools.cmake").install(package, configs)
     end)
 
-    on_install("macosx", "linux", function (package)
+    on_install("macosx", "linux", "mingw@linux,macosx", function (package)
         local configs = {}
         if package:config("shared") then
             table.insert(configs, "--enable-shared=yes")

packages/p/pcre2/xmake.lua

@@ -43,7 +43,7 @@ package("pcre2")
         end)
     end
 
-    on_install("macosx", "linux", function (package)
+    on_install("macosx", "linux", "mingw@linux,macosx", function (package)
         local configs = {}
         if package:config("shared") then
             table.insert(configs, "--enable-shared=yes")

packages/x/xz/xmake.lua

@@ -7,15 +7,28 @@ package("xz")
              "https://tukaani.org/xz/xz-$(version).tar.gz")
     add_versions("5.2.4", "b512f3b726d3b37b6dc4c8570e137b9311e7552e8ccbab4d39d47ce5f4177145")
 
-    on_install("macosx", "linux", function (package)
+    on_load(function (package)
+        if is_plat(os.host()) then
+            package:addenv("PATH", "bin")
+        end
+    end)
+
+    on_install("macosx", "linux", "mingw@linux,macosx", function (package)
         local configs = {"--disable-dependency-tracking", "--disable-silent-rules"}
         if package:debug() then
             table.insert(configs, "--enable-debug")
         end
+        if package:config("shared") then
+            table.insert(configs, "--enable-shared=yes")
+        else
+            table.insert(configs, "--enable-shared=no")
+        end
         import("package.tools.autoconf").install(package, configs)
     end)
 
     on_test(function (package)
-        os.vrun("xz --version")
+        if is_plat(os.host()) then
+            os.vrun("xz --version")
+        end
         assert(package:has_cfuncs("lzma_code", {includes = "lzma.h"}))
     end)