Skip to content

Commit 42f0614

Browse files
authored
Zstd (#3947)
* 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. * zstd: Works better with cmake as a depends. * zstd: Another rework of this module. As noted in my last comment on this PR there is an issue with the cmake config modules it installls. Notably with qt6-tools failing its configuration stage, its an issue with defining libzstd_shared. Using zstd make or the meson build avoids this problem because qt6-tools configuration simply moves on with the compile ignoring the /usr/lib64/cmake/zstd/*.cmake problem when they are not present.
1 parent cc27d75 commit 42f0614

File tree

3 files changed

+7
-20
lines changed

3 files changed

+7
-20
lines changed

archive/zstd/BUILD

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
1-
cd build/cmake
1+
cd build/meson
22

3-
OPTS+=" -DCMAKE_BUILD_TYPE=Release \
4-
-DCMAKE_INSTALL_PREFIX=/usr \
5-
-DCMAKE_INSTALL_LIBDIR=lib \
6-
-DZSTD_ZLIB_SUPPORT=ON \
7-
-DZSTD_LZ4_SUPPORT=ON \
8-
-DZSTD_BUILD_CONTRIB=ON \
9-
-DZSTD_BUILD_STATIC=OFF \
10-
-DZSTD_BUILD_TESTS=OFF \
11-
-DZSTD_PROGRAMS_LINK_SHARED=ON \
12-
-Wno-dev"
3+
OPTS+=" -Dbin_contrib=true -Dbin_contrib=true"
134

14-
cmake -B $MODULE-$VERSION -S . -G Ninja $OPTS &&
15-
cmake --build $MODULE-$VERSION &&
16-
17-
prepare_install
18-
cmake --install $MODULE-$VERSION
5+
default_meson_build

archive/zstd/DEPENDS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
depends xz
22
depends lz4
33
depends zlib
4-
depends cmake
4+
depends meson
55

6-
optional_depends lzma-sdk "-DZSTD_LZMA_SUPPORT=ON" "-DZSTD_LZMA_SUPPORT=OFF" "for lzma archiving support"
6+
optional_depends lzma-sdk "-Dlzma=enabled" "-Dlzma=disabled" "for lzma archiving support"

archive/zstd/DETAILS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
MODULE=zstd
22
VERSION=1.5.7
33
SOURCE=$MODULE-$VERSION.tar.gz
4-
SOURCE_URL_FULL=https://github.com/facebook/zstd/archive/v$VERSION.tar.gz
5-
SOURCE_VFY=sha256:37d7284556b20954e56e1ca85b80226768902e2edabd3b649e9e72c0c9012ee3
4+
SOURCE_URL=https://github.com/facebook/zstd/releases/download/v$VERSION/
5+
SOURCE_VFY=sha256:eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3
66
WEB_SITE=https://github.com/facebook/zstd
77
ENTERED=20180122
88
UPDATED=20250222

0 commit comments

Comments
 (0)