Skip to content

libarchive: update zstd dependency checks to version-compare based de… #2940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nda-cunh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

libarchive: update zstd dependency checks to version-compare based de… #2940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions releases.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2117,6 +2117,7 @@
"bsdtar"
],
"versions": [
"3.8.9-2",
"3.8.9-1",
"3.8.8-1",
"3.8.7-2",
Expand Down
19 changes: 10 additions & 9 deletions subprojects/packagefiles/libarchive/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'c',
version: '3.8.9',
license: 'BSD-2-Clause AND BSD-3-Clause AND (CC0-1.0 OR OpenSSL OR Apache-2.0)',
meson_version: '>=0.56.0',

Check notice on line 6 in subprojects/packagefiles/libarchive/meson.build

View workflow job for this annotation

GitHub Actions / Ubuntu (x86_64)

Minimum Meson version is 0.56.0 

0.56.0: oldest version supported by WrapDB
)

cdata = configuration_data()
Expand Down Expand Up @@ -343,15 +343,16 @@
cdata.set('HAVE_LIBZSTD', 1)
cdata.set('HAVE_ZSTD_H', 1)
deps += zstd_dep
foreach sym : ['ZSTD_compressStream', 'ZSTD_minCLevel']
if cc.has_header_symbol(
'zstd.h',
sym,
dependencies: zstd_dep,
)
cdata.set('HAVE_' + sym, 1)
endif
endforeach
# cc.has_header_symbol() rejects internal (subproject/wrap) dependencies,
# so use version comparison instead — this works for both external and
# internal zstd_dep alike.
zstd_version = zstd_dep.version()
if zstd_version == 'unknown' or zstd_version.version_compare('>=1.0.0')
cdata.set('HAVE_ZSTD_compressStream', 1)
endif
if zstd_version == 'unknown' or zstd_version.version_compare('>=1.4.0')
cdata.set('HAVE_ZSTD_minCLevel', 1)
endif
endif

lzma_dep = dependency(
Expand Down
Loading