From d4d7ccd775a451e1a8f650a0da8c898bca192c4d Mon Sep 17 00:00:00 2001 From: Dennis Veatch Date: Mon, 7 Jul 2025 16:49:14 -0400 Subject: [PATCH 1/2] zstd: No version bump, just using cmake instead so various *.cmake files get created and installed for those apps looking for them. Also added lzma-sdk as an optional_depends. --- archive/zstd/BUILD | 23 ++++++++++++++++------- archive/zstd/DEPENDS | 2 ++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/archive/zstd/BUILD b/archive/zstd/BUILD index fd9df6ada..9bc160900 100644 --- a/archive/zstd/BUILD +++ b/archive/zstd/BUILD @@ -1,9 +1,18 @@ -make && -make zstdmt && -make -C contrib/pzstd && +cd build/cmake -prepare_install && +OPTS+=" -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DZSTD_ZLIB_SUPPORT=ON \ + -DZSTD_LZ4_SUPPORT=ON \ + -DZSTD_BUILD_CONTRIB=ON \ + -DZSTD_BUILD_STATIC=OFF \ + -DZSTD_BUILD_TESTS=OFF \ + -DZSTD_PROGRAMS_LINK_SHARED=ON \ + -Wno-dev" -make PREFIX=/usr install && -ln -f /usr/bin/zstd /usr/bin/zstdmt && -install -Dm755 contrib/pzstd/pzstd /usr/bin/pzstd +cmake -B $MODULE-$VERSION -S . -G Ninja $OPTS && +cmake --build $MODULE-$VERSION && + +prepare_install +cmake --install $MODULE-$VERSION diff --git a/archive/zstd/DEPENDS b/archive/zstd/DEPENDS index 4baf6e116..18d0b9481 100644 --- a/archive/zstd/DEPENDS +++ b/archive/zstd/DEPENDS @@ -1,3 +1,5 @@ depends xz depends lz4 depends zlib + +optional_depends lzma-sdk "-DZSTD_LZMA_SUPPORT=ON" "-DZSTD_LZMA_SUPPORT=OFF" "for lzma archiving support" From aa0ebc24ce56b6f62138bfc5189655f2030939e9 Mon Sep 17 00:00:00 2001 From: Dennis Veatch Date: Mon, 7 Jul 2025 16:55:07 -0400 Subject: [PATCH 2/2] zstd: Works better with cmake as a depends. --- archive/zstd/DEPENDS | 1 + 1 file changed, 1 insertion(+) diff --git a/archive/zstd/DEPENDS b/archive/zstd/DEPENDS index 18d0b9481..1855f2a16 100644 --- a/archive/zstd/DEPENDS +++ b/archive/zstd/DEPENDS @@ -1,5 +1,6 @@ depends xz depends lz4 depends zlib +depends cmake optional_depends lzma-sdk "-DZSTD_LZMA_SUPPORT=ON" "-DZSTD_LZMA_SUPPORT=OFF" "for lzma archiving support"