update lzma and xz (#1771)

* update lzma

* update xz

* fix xz for shared libs

* update ci for p7zip

.github/workflows/archlinux.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Installation
         run: |
           pacman -Syu --noconfirm --needed openssl
-          pacman -Sy --noconfirm --needed glibc git base-devel perl make unzip
+          pacman -Sy --noconfirm --needed glibc git base-devel perl make unzip p7zip
           pacman -Sy --noconfirm --needed mesa gcc-fortran glu
           git config --global --add safe.directory /__w/xmake/xmake
           git config --global --add safe.directory /__w/xmake-repo/xmake-repo

.github/workflows/fedora.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Installation
         run: |
           uname -a
-          dnf -y install gfortran
+          dnf -y install gfortran p7zip
           dnf -y install mesa-libGL-devel mesa-libGLU-devel
           dnf -y install @development-tools @rpm-development-tools
           dnf -y install copr-cli make gcc-c++ libatomic

.github/workflows/monkey_linux.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Installation
         run: |
           # TODO we will remove it later
-          sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev
+          sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev p7zip
           sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 60
           sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60
           sudo update-alternatives --install /usr/bin/cpp cpp /usr/bin/cpp-9 60

.github/workflows/ubuntu.yml

@@ -28,7 +28,7 @@ jobs:
         run: |
           # TODO we will remove it later
           sudo apt-get update
-          sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev
+          sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev p7zip
           sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 60
           sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60
           sudo update-alternatives --install /usr/bin/cpp cpp /usr/bin/cpp-9 60

.github/workflows/ubuntu_clang.yml

@@ -28,7 +28,7 @@ jobs:
         run: |
           # TODO we will remove it later
           sudo apt-get update
-          sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev clang libc++-dev
+          sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev clang libc++-dev p7zip
 
       - name: Tests
         run: |

packages/l/lzma/xmake.lua

@@ -3,8 +3,9 @@ package("lzma")
     set_homepage("https://www.7-zip.org/sdk.html")
     set_description("LZMA SDK")
 
-    add_urls("https://www.7-zip.org/a/lzma1900.7z", {version = function (version) return version:gsub("%.", "") end})
+    add_urls("https://www.7-zip.org/a/lzma$(version).7z", {version = function (version) return version:gsub("%.", "") end})
     add_versions("19.00", "00f569e624b3d9ed89cf8d40136662c4c5207eaceb92a70b1044c77f84234bad")
+    add_versions("22.01", "35b1689169efbc7c3c147387e5495130f371b4bad8ec24f049d28e126d52d9fe")
 
     on_install("windows", "linux", "macosx", function (package)
         os.cd("C")
@@ -12,10 +13,10 @@ package("lzma")
             add_rules("mode.debug", "mode.release")
             target("lzma")
                 set_kind("$(kind)")
-                add_files("Alloc.c", "LzFind.c",  "Lzma2Dec.c", "Lzma2Enc.c", "LzmaDec.c", "LzmaEnc.c", "LzmaLib.c")
+                add_files("Alloc.c", "LzFind.c",  "Lzma2Dec.c", "Lzma2Enc.c", "LzmaDec.c", "LzmaEnc.c", "LzmaLib.c", "CpuArch.c")
                 add_headerfiles("7zTypes.h", "LzFind.h", "LzHash.h", "Lzma2Dec.h", "Lzma2Enc.h", "LzmaDec.h", "LzmaEnc.h", "LzmaLib.h")
                 if is_plat("windows") then
-                    add_files("LzFindMt.c", "MtCoder.c", "MtDec.c", "Threads.c", "DllSecur.c", "Lzma2DecMt.c")
+                    add_files("LzFindMt.c", "LzFindOpt.c", "MtCoder.c", "MtDec.c", "Threads.c", "DllSecur.c", "Lzma2DecMt.c")
                     add_headerfiles("LzFindMt.h", "Lzma2DecMt.h")
                 else
                     add_defines("_7ZIP_ST")

packages/x/xz/xmake.lua

@@ -6,11 +6,10 @@ package("xz")
     set_urls("https://downloads.sourceforge.net/project/lzmautils/xz-$(version).tar.gz",
              "https://tukaani.org/xz/xz-$(version).tar.gz")
     add_versions("5.2.5", "f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10")
+    add_versions("5.2.10", "eb7a3b2623c9d0135da70ca12808a214be9c019132baaa61c9e1d198d1d9ded3")
+    add_versions("5.4.1", "e4b0f81582efa155ccf27bb88275254a429d44968e488fc94b806f2a61cd3e22")
 
     on_load(function (package)
-        if is_plat(os.host()) then
-            package:addenv("PATH", "bin")
-        end
         if package:is_plat("windows") and not package:config("shared") then
             package:add("defines", "LZMA_API_STATIC")
         end
@@ -61,11 +60,16 @@ package("xz")
             table.insert(configs, "--enable-debug")
         end
         if package:config("shared") then
+            table.insert(configs, "--enable-static=no")
             table.insert(configs, "--enable-shared=yes")
         else
+            table.insert(configs, "--enable-static=yes")
             table.insert(configs, "--enable-shared=no")
         end
         import("package.tools.autoconf").install(package, configs)
+        if not package:is_cross() then
+            package:addenv("PATH", "bin")
+        end
     end)
 
     on_test(function (package)