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.

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

Conversation

SpaceIm
Copy link
Contributor

@SpaceIm SpaceIm commented Sep 10, 2024

Summary

Changes to recipe: lib/[version]

Motivation

Use version range for xz_utils & zstd dependencies since it's now allowed, and bump some other deps in the meantime.
While bumping versions, I've realized that pcre2 was duplicated in requirements: with_pcreposix actually requires pcre, not pcre2 (and with_pcre2 requires pcre2), so it's fixed in the meantime.

Details

Proof that with_pcreposix (which maps to ENABLE_PCREPOSIX CMake option of upstream CMakeLists) requires pcre, not pcre2:
https://github.com/libarchive/libarchive/blob/853bf656ef6d294a4fedc9afc74b262c3c0a6501/CMakeLists.txt#L1306-L1307
https://github.com/libarchive/libarchive/blob/853bf656ef6d294a4fedc9afc74b262c3c0a6501/build/cmake/FindPCREPOSIX.cmake


@conan-center-bot

This comment has been minimized.

@AbrilRBS AbrilRBS closed this Sep 12, 2024
@AbrilRBS AbrilRBS reopened this Sep 12, 2024
@AbrilRBS
Copy link
Member

Reopening this one as it's also a bugfix

@AbrilRBS AbrilRBS self-assigned this Sep 12, 2024
@conan-center-bot

This comment has been minimized.

Copy link
Member

@AbrilRBS AbrilRBS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the logs showing that pcre should be used, quite helpful :)

recipes/libarchive/all/conanfile.py Outdated Show resolved Hide resolved
@conan-center-bot

This comment has been minimized.

AbrilRBS
AbrilRBS previously approved these changes Sep 16, 2024
Copy link
Member

@AbrilRBS AbrilRBS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

Copy link
Member

@uilianries uilianries left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch with pcre. Indeed that option is False by default, so we didn't see at first review. Thank you.

@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 4 (f4a9758edd83ed6ab0d2ae4dfbc465c332720e3f):

  • libarchive/3.7.1:
    Built 20 packages out of 22 (All logs)

  • libarchive/3.7.2:
    Built 20 packages out of 22 (All logs)

  • libarchive/3.7.4:
    Built 20 packages out of 22 (All logs)

  • libarchive/3.7.3:
    Built 20 packages out of 22 (All logs)


Conan v2 pipeline ✔️

Note: Conan v2 builds are now mandatory. Please read our discussion about it.

All green in build 4 (f4a9758edd83ed6ab0d2ae4dfbc465c332720e3f):

  • libarchive/3.7.2:
    All packages built successfully! (All logs)

  • libarchive/3.7.1:
    All packages built successfully! (All logs)

  • libarchive/3.7.4:
    All packages built successfully! (All logs)

  • libarchive/3.7.3:
    All packages built successfully! (All logs)

@conan-center-bot conan-center-bot merged commit 5e31e69 into conan-io:master Sep 16, 2024
24 checks passed
@SpaceIm SpaceIm deleted the libarchive-version-range branch September 16, 2024 11:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants