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

Backport ocaml/ocaml#13100 to 5.1.x ocaml-variants #25828

Merged
merged 2 commits into from
Jul 12, 2024

Conversation

dra27
Copy link
Member

@dra27 dra27 commented May 10, 2024

When building with ocaml-option-musl, zstd detection in OCaml fails if pkg-config and libzstd are installed for the host. This is fixed in 5.2.0. ocaml-base-compiler is unaffected.

This PR is a draft and should not be merged until after opam 2.2.0 beta3 is released as it breaks ocaml-variants.5.1.1+effects, ocaml-variants.5.1.0+options and ocaml-variants.5.1.1+options on Windows (ocaml/opam#5921).

@dra27 dra27 marked this pull request as ready for review June 26, 2024 20:37
dra27 added 2 commits June 27, 2024 22:04
When building with ocaml-option-musl, zstd detection in OCaml fails if
pkg-config and libzstd are installed for the host. This is fixed in
5.2.0. ocaml-base-compiler is unaffected.
@mseri
Copy link
Member

mseri commented Jul 10, 2024

@dra27 Is this safe to merge?

@dra27
Copy link
Member Author

dra27 commented Jul 12, 2024

It should be, yes (🤞)

@mseri mseri merged commit a84c997 into ocaml:master Jul 12, 2024
1 of 2 checks passed
@mseri
Copy link
Member

mseri commented Jul 12, 2024

Thanks

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.

2 participants