From 466c7158336346c795d8cc05c7312a677dfb161a Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Fri, 5 Sep 2025 11:59:19 +0100 Subject: [PATCH] Fix ocaml-base-compiler.5.3.0+ for MSVC --- .../ocaml-option-no-compression.1/opam | 7 ++++++- .../ocaml-options-vanilla/ocaml-options-vanilla.1/opam | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/ocaml-option-no-compression/ocaml-option-no-compression.1/opam b/packages/ocaml-option-no-compression/ocaml-option-no-compression.1/opam index 11eadb0f4edb..e6d4be243d17 100644 --- a/packages/ocaml-option-no-compression/ocaml-option-no-compression.1/opam +++ b/packages/ocaml-option-no-compression/ocaml-option-no-compression.1/opam @@ -8,7 +8,12 @@ homepage: "https://opam.ocaml.org" bug-reports: "https://github.com/ocaml/opam-repository/issues" license: "CC0-1.0+" depends: [ - "ocaml-variants" {post & >= "5.1.0~"} + "ocaml-variants" {post & >= "5.1.0~"} | + # The MSVC port OCaml doesn't support compression and for equivalence with the + # handling of ocaml-option-bytecode-only pulls in ocaml-option-no-compression. + # As with ocaml-option-bytecode-only, this is a temporary fix until + # ocaml-option- / base- is sorted out properly. + ("ocaml-base-compiler" {post & >= "5.1.0~"} & "host-system-msvc" {post}) ] maintainer: "David Allsopp " flags: compiler diff --git a/packages/ocaml-options-vanilla/ocaml-options-vanilla.1/opam b/packages/ocaml-options-vanilla/ocaml-options-vanilla.1/opam index 9f0938b40235..f2169749fc48 100644 --- a/packages/ocaml-options-vanilla/ocaml-options-vanilla.1/opam +++ b/packages/ocaml-options-vanilla/ocaml-options-vanilla.1/opam @@ -27,7 +27,8 @@ conflicts: [ "ocaml-option-fp" "ocaml-option-musl" "ocaml-option-no-flat-float-array" - "ocaml-option-no-compression" + # See constraint in ocaml-option-no-compression + "ocaml-option-no-compression" {os != "win32"} "ocaml-option-spacetime" "ocaml-option-static" "ocaml-option-nnp"