Skip to content
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

libarchive: bump deps & use version range for xz_utils & zstd + use correct dependency for with_pcreposix option #25213

Merged
merged 4 commits into from
Sep 16, 2024
Merged

libarchive: bump deps & use version range for xz_utils & zstd + use correct dependency for with_pcreposix option #25213

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ea2bb0
bump deps & use version range for xz_utils & zstd
SpaceIm Sep 10, 2024
cddd985
depends on pcre instead of pcre2 when with_pcreposix is enabled
SpaceIm Sep 10, 2024
2fd08ae
Update recipes/libarchive/all/conanfile.py
AbrilRBS Sep 13, 2024
f4a9758
Fix conflicts
AbrilRBS Sep 16, 2024
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
10 changes: 5 additions & 5 deletions recipes/libarchive/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def requirements(self):
if self.options.with_iconv:
self.requires("libiconv/1.17")
if self.options.with_pcreposix:
self.requires("pcre2/10.42")
self.requires("pcre/8.45")
if self.options.with_nettle:
self.requires("nettle/3.9.1")
if self.options.with_openssl:
Expand All @@ -105,13 +105,13 @@ def requirements(self):
if self.options.with_lzo:
self.requires("lzo/2.10")
if self.options.with_lzma:
self.requires("xz_utils/5.4.5")
self.requires("xz_utils/[>=5.4.5 <6]")
if self.options.with_zstd:
self.requires("zstd/1.5.5")
self.requires("zstd/[>=1.5 <1.6]")
if self.options.get_safe("with_mbedtls"):
self.requires("mbedtls/3.5.1")
self.requires("mbedtls/3.6.1")
if self.options.get_safe("with_pcre2"):
self.requires("pcre2/10.43")
self.requires("pcre2/10.44")

def validate(self):
if self.settings.os != "Windows" and self.options.with_cng:
Expand Down
Loading