diff --git a/packages/host-arch-arm32/host-arch-arm32.1/opam b/packages/host-arch-arm32/host-arch-arm32.1/opam index 3425ae857b44..a50164a25b8c 100644 --- a/packages/host-arch-arm32/host-arch-arm32.1/opam +++ b/packages/host-arch-arm32/host-arch-arm32.1/opam @@ -14,3 +14,6 @@ license: "CC0-1.0+" homepage: "https://opam.ocaml.org" bug-reports: "https://github.com/ocaml/opam-repository/issues" conflict-class: "ocaml-host-arch" +# Temporary, while these packages are not being installed by the compilers on +# non-Windows builds. +available: os = "win32" | arch = "arm32" diff --git a/packages/host-arch-arm64/host-arch-arm64.1/opam b/packages/host-arch-arm64/host-arch-arm64.1/opam index 7e635b2b4ebf..a3af978bd3c7 100644 --- a/packages/host-arch-arm64/host-arch-arm64.1/opam +++ b/packages/host-arch-arm64/host-arch-arm64.1/opam @@ -14,3 +14,6 @@ license: "CC0-1.0+" homepage: "https://opam.ocaml.org" bug-reports: "https://github.com/ocaml/opam-repository/issues" conflict-class: "ocaml-host-arch" +# Temporary, while these packages are not being installed by the compilers on +# non-Windows builds. +available: os = "win32" | arch = "arm64" diff --git a/packages/host-arch-ppc64/host-arch-ppc64.1/opam b/packages/host-arch-ppc64/host-arch-ppc64.1/opam index 03bb0798d0bf..44a226e591d0 100644 --- a/packages/host-arch-ppc64/host-arch-ppc64.1/opam +++ b/packages/host-arch-ppc64/host-arch-ppc64.1/opam @@ -15,3 +15,6 @@ license: "CC0-1.0+" homepage: "https://opam.ocaml.org" bug-reports: "https://github.com/ocaml/opam-repository/issues" conflict-class: "ocaml-host-arch" +# Temporary, while these packages are not being installed by the compilers on +# non-Windows builds. +available: os = "win32" | arch = "ppc64" diff --git a/packages/host-arch-riscv64/host-arch-riscv64.1/opam b/packages/host-arch-riscv64/host-arch-riscv64.1/opam index 2ca7b30a397a..0d81cf8e7179 100644 --- a/packages/host-arch-riscv64/host-arch-riscv64.1/opam +++ b/packages/host-arch-riscv64/host-arch-riscv64.1/opam @@ -14,3 +14,6 @@ license: "CC0-1.0+" homepage: "https://opam.ocaml.org" bug-reports: "https://github.com/ocaml/opam-repository/issues" conflict-class: "ocaml-host-arch" +# Temporary, while these packages are not being installed by the compilers on +# non-Windows builds. +available: os = "win32" | arch = "riscv64" diff --git a/packages/host-arch-s390x/host-arch-s390x.1/opam b/packages/host-arch-s390x/host-arch-s390x.1/opam index 05b4acb75957..92d0d485530a 100644 --- a/packages/host-arch-s390x/host-arch-s390x.1/opam +++ b/packages/host-arch-s390x/host-arch-s390x.1/opam @@ -15,3 +15,6 @@ license: "CC0-1.0+" homepage: "https://opam.ocaml.org" bug-reports: "https://github.com/ocaml/opam-repository/issues" conflict-class: "ocaml-host-arch" +# Temporary, while these packages are not being installed by the compilers on +# non-Windows builds. +available: os = "win32" | arch = "s390x" diff --git a/packages/host-arch-unknown/host-arch-unknown.1/opam b/packages/host-arch-unknown/host-arch-unknown.1/opam index f175643611d5..f097009bd60f 100644 --- a/packages/host-arch-unknown/host-arch-unknown.1/opam +++ b/packages/host-arch-unknown/host-arch-unknown.1/opam @@ -14,3 +14,6 @@ license: "CC0-1.0+" homepage: "https://opam.ocaml.org" bug-reports: "https://github.com/ocaml/opam-repository/issues" conflict-class: "ocaml-host-arch" +# Temporary, while these packages are not being installed by the compilers on +# non-Windows builds. +available: arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" diff --git a/packages/host-arch-x86_32/host-arch-x86_32.1/opam b/packages/host-arch-x86_32/host-arch-x86_32.1/opam index 0ba082c0f241..ff6b64a41901 100644 --- a/packages/host-arch-x86_32/host-arch-x86_32.1/opam +++ b/packages/host-arch-x86_32/host-arch-x86_32.1/opam @@ -15,3 +15,6 @@ license: "CC0-1.0+" homepage: "https://opam.ocaml.org" bug-reports: "https://github.com/ocaml/opam-repository/issues" conflict-class: "ocaml-host-arch" +# Temporary, while these packages are not being installed by the compilers on +# non-Windows builds. +available: os = "win32" | arch = "x86_32" diff --git a/packages/host-arch-x86_64/host-arch-x86_64.1/opam b/packages/host-arch-x86_64/host-arch-x86_64.1/opam index 75e30659a4fe..4d52d5544797 100644 --- a/packages/host-arch-x86_64/host-arch-x86_64.1/opam +++ b/packages/host-arch-x86_64/host-arch-x86_64.1/opam @@ -15,3 +15,6 @@ license: "CC0-1.0+" homepage: "https://opam.ocaml.org" bug-reports: "https://github.com/ocaml/opam-repository/issues" conflict-class: "ocaml-host-arch" +# Temporary, while these packages are not being installed by the compilers on +# non-Windows builds. +available: os = "win32" | arch = "x86_64" diff --git a/packages/host-system-mingw/host-system-mingw.1/opam b/packages/host-system-mingw/host-system-mingw.1/opam index 2b4d84a57829..fa3ea2d8c9a1 100644 --- a/packages/host-system-mingw/host-system-mingw.1/opam +++ b/packages/host-system-mingw/host-system-mingw.1/opam @@ -15,3 +15,4 @@ license: "CC0-1.0+" homepage: "https://opam.ocaml.org" bug-reports: "https://github.com/ocaml/opam-repository/issues" conflict-class: "ocaml-host-system" +available: os = "win32" diff --git a/packages/host-system-msvc/host-system-msvc.1/opam b/packages/host-system-msvc/host-system-msvc.1/opam index 66984966d731..b53a24b17019 100644 --- a/packages/host-system-msvc/host-system-msvc.1/opam +++ b/packages/host-system-msvc/host-system-msvc.1/opam @@ -15,3 +15,4 @@ license: "CC0-1.0+" homepage: "https://opam.ocaml.org" bug-reports: "https://github.com/ocaml/opam-repository/issues" conflict-class: "ocaml-host-system" +available: os = "win32" diff --git a/packages/host-system-other/host-system-other.1/opam b/packages/host-system-other/host-system-other.1/opam index 9e2fd9269a10..99186c66deb4 100644 --- a/packages/host-system-other/host-system-other.1/opam +++ b/packages/host-system-other/host-system-other.1/opam @@ -13,3 +13,4 @@ license: "CC0-1.0+" homepage: "https://opam.ocaml.org" bug-reports: "https://github.com/ocaml/opam-repository/issues" conflict-class: "ocaml-host-system" +available: os != "win32" diff --git a/packages/ocaml-base-compiler/ocaml-base-compiler.4.13.0/opam b/packages/ocaml-base-compiler/ocaml-base-compiler.4.13.0/opam index f132f0c6209d..fc5667163c50 100644 --- a/packages/ocaml-base-compiler/ocaml-base-compiler.4.13.0/opam +++ b/packages/ocaml-base-compiler/ocaml-base-compiler.4.13.0/opam @@ -18,21 +18,6 @@ depends: [ "base-bigarray" {post} "base-threads" {post} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - "host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 / MSVC (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -42,8 +27,9 @@ depends: [ ("arch-x86_32" {os = "win32"} & (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) | "system-msvc")) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # OCaml with default configuration (no flambda, TSAN, etc.) "ocaml-options-vanilla" {post} diff --git a/packages/ocaml-base-compiler/ocaml-base-compiler.4.13.1/opam b/packages/ocaml-base-compiler/ocaml-base-compiler.4.13.1/opam index 129d91ee54b9..4e0a6401dfaf 100644 --- a/packages/ocaml-base-compiler/ocaml-base-compiler.4.13.1/opam +++ b/packages/ocaml-base-compiler/ocaml-base-compiler.4.13.1/opam @@ -18,21 +18,6 @@ depends: [ "base-bigarray" {post} "base-threads" {post} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - "host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 / MSVC (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -42,8 +27,9 @@ depends: [ ("arch-x86_32" {os = "win32"} & (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) | "system-msvc")) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # OCaml with default configuration (no flambda, TSAN, etc.) "ocaml-options-vanilla" {post} diff --git a/packages/ocaml-base-compiler/ocaml-base-compiler.4.14.0/opam b/packages/ocaml-base-compiler/ocaml-base-compiler.4.14.0/opam index ef2b0a11edad..65471f76875b 100644 --- a/packages/ocaml-base-compiler/ocaml-base-compiler.4.14.0/opam +++ b/packages/ocaml-base-compiler/ocaml-base-compiler.4.14.0/opam @@ -18,21 +18,6 @@ depends: [ "base-bigarray" {post} "base-threads" {post} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - "host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 / MSVC (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -42,8 +27,9 @@ depends: [ ("arch-x86_32" {os = "win32"} & (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) | "system-msvc")) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # OCaml with default configuration (no flambda, TSAN, etc.) "ocaml-options-vanilla" {post} diff --git a/packages/ocaml-base-compiler/ocaml-base-compiler.4.14.1/opam b/packages/ocaml-base-compiler/ocaml-base-compiler.4.14.1/opam index 36b741fae803..4a692607305c 100644 --- a/packages/ocaml-base-compiler/ocaml-base-compiler.4.14.1/opam +++ b/packages/ocaml-base-compiler/ocaml-base-compiler.4.14.1/opam @@ -18,21 +18,6 @@ depends: [ "base-bigarray" {post} "base-threads" {post} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - "host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 / MSVC (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -42,8 +27,9 @@ depends: [ ("arch-x86_32" {os = "win32"} & (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) | "system-msvc")) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # OCaml with default configuration (no flambda, TSAN, etc.) "ocaml-options-vanilla" {post} diff --git a/packages/ocaml-base-compiler/ocaml-base-compiler.4.14.2/opam b/packages/ocaml-base-compiler/ocaml-base-compiler.4.14.2/opam index a4f9ff8dcfa7..3819647582d6 100644 --- a/packages/ocaml-base-compiler/ocaml-base-compiler.4.14.2/opam +++ b/packages/ocaml-base-compiler/ocaml-base-compiler.4.14.2/opam @@ -18,21 +18,6 @@ depends: [ "base-bigarray" {post} "base-threads" {post} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - "host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 / MSVC (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -42,8 +27,9 @@ depends: [ ("arch-x86_32" {os = "win32"} & (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) | "system-msvc")) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # OCaml with default configuration (no flambda, TSAN, etc.) "ocaml-options-vanilla" {post} diff --git a/packages/ocaml-base-compiler/ocaml-base-compiler.5.0.0/opam b/packages/ocaml-base-compiler/ocaml-base-compiler.5.0.0/opam index 1facbb85d8bc..ce057966bb71 100644 --- a/packages/ocaml-base-compiler/ocaml-base-compiler.5.0.0/opam +++ b/packages/ocaml-base-compiler/ocaml-base-compiler.5.0.0/opam @@ -20,21 +20,6 @@ depends: [ "base-domains" {post} "base-nnp" {post} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - "host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 only (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -42,8 +27,9 @@ depends: [ # i686 mingw-w64 only ("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" & "system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # OCaml with default configuration (no flambda, TSAN, etc.) "ocaml-options-vanilla" {post} diff --git a/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0/opam b/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0/opam index c259fd9fbb71..b3bf789b5a04 100644 --- a/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0/opam +++ b/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0/opam @@ -20,21 +20,6 @@ depends: [ "base-domains" {post} "base-nnp" {post} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - "host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 only (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -42,8 +27,9 @@ depends: [ # i686 mingw-w64 only ("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" & "system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # OCaml with default configuration (no flambda, TSAN, etc.) "ocaml-options-vanilla" {post} diff --git a/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.1/opam b/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.1/opam index 33b54bb60c80..6981a3e73567 100644 --- a/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.1/opam +++ b/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.1/opam @@ -20,21 +20,6 @@ depends: [ "base-domains" {post} "base-nnp" {post} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - "host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 only (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -42,8 +27,9 @@ depends: [ # i686 mingw-w64 only ("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" & "system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # OCaml with default configuration (no flambda, TSAN, etc.) "ocaml-options-vanilla" {post} diff --git a/packages/ocaml-base-compiler/ocaml-base-compiler.5.2.0/opam b/packages/ocaml-base-compiler/ocaml-base-compiler.5.2.0/opam index 31443489ea64..cbe6ee8afce4 100644 --- a/packages/ocaml-base-compiler/ocaml-base-compiler.5.2.0/opam +++ b/packages/ocaml-base-compiler/ocaml-base-compiler.5.2.0/opam @@ -20,21 +20,6 @@ depends: [ "base-domains" {post} "base-nnp" {post} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - "host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 only (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -42,8 +27,9 @@ depends: [ # i686 mingw-w64 only ("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" & "system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # OCaml with default configuration (no flambda, TSAN, etc.) "ocaml-options-vanilla" {post} diff --git a/packages/ocaml-base-compiler/ocaml-base-compiler.5.2.1/opam b/packages/ocaml-base-compiler/ocaml-base-compiler.5.2.1/opam index 383e161e5d48..4bcf6a906f33 100644 --- a/packages/ocaml-base-compiler/ocaml-base-compiler.5.2.1/opam +++ b/packages/ocaml-base-compiler/ocaml-base-compiler.5.2.1/opam @@ -20,21 +20,6 @@ depends: [ "base-domains" {post} "base-nnp" {post} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - "host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 only (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -42,8 +27,9 @@ depends: [ # i686 mingw-w64 only ("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" & "system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # OCaml with default configuration (no flambda, TSAN, etc.) "ocaml-options-vanilla" {post} diff --git a/packages/ocaml-compiler/ocaml-compiler.5.3.0~alpha1/opam b/packages/ocaml-compiler/ocaml-compiler.5.3.0~alpha1/opam index abc910bfc26f..93fac08106ea 100644 --- a/packages/ocaml-compiler/ocaml-compiler.5.3.0~alpha1/opam +++ b/packages/ocaml-compiler/ocaml-compiler.5.3.0~alpha1/opam @@ -31,22 +31,6 @@ depends: [ "ocaml-beta" {opam-version < "2.1.0"} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - ("host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} | - ("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"})) - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 / MSVC (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -56,8 +40,9 @@ depends: [ ("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" {os = "win32"} & (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) | ("system-msvc" & "winpthreads" & "ocaml-option-no-compression" {os = "win32"}))) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # All the 32-bit architectures are bytecode-only "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64" & arch != "s390x" & arch != "riscv64" & arch != "ppc64"} diff --git a/packages/ocaml-compiler/ocaml-compiler.5.3.0~beta1/opam b/packages/ocaml-compiler/ocaml-compiler.5.3.0~beta1/opam index f13ebc698f63..c7e3c263f657 100644 --- a/packages/ocaml-compiler/ocaml-compiler.5.3.0~beta1/opam +++ b/packages/ocaml-compiler/ocaml-compiler.5.3.0~beta1/opam @@ -31,22 +31,6 @@ depends: [ "ocaml-beta" {opam-version < "2.1.0"} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - ("host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} | - ("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"})) - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 / MSVC (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -56,8 +40,9 @@ depends: [ ("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" {os = "win32"} & (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) | ("system-msvc" & "winpthreads" & "ocaml-option-no-compression" {os = "win32"}))) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # All the 32-bit architectures are bytecode-only "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64" & arch != "s390x" & arch != "riscv64" & arch != "ppc64"} diff --git a/packages/ocaml-compiler/ocaml-compiler.5.3.0~beta2/opam b/packages/ocaml-compiler/ocaml-compiler.5.3.0~beta2/opam index d9bf7b2e1fdd..bfd249470910 100644 --- a/packages/ocaml-compiler/ocaml-compiler.5.3.0~beta2/opam +++ b/packages/ocaml-compiler/ocaml-compiler.5.3.0~beta2/opam @@ -31,22 +31,6 @@ depends: [ "ocaml-beta" {opam-version < "2.1.0"} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - ("host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} | - ("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"})) - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 / MSVC (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -56,8 +40,9 @@ depends: [ ("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" {os = "win32"} & (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) | ("system-msvc" & "winpthreads" & "ocaml-option-no-compression" {os = "win32"}))) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # All the 32-bit architectures are bytecode-only "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64" & arch != "s390x" & arch != "riscv64" & arch != "ppc64"} diff --git a/packages/ocaml-secondary-compiler/ocaml-secondary-compiler.4.14.2/opam b/packages/ocaml-secondary-compiler/ocaml-secondary-compiler.4.14.2/opam index 7138af478f1a..cdf48f949efb 100644 --- a/packages/ocaml-secondary-compiler/ocaml-secondary-compiler.4.14.2/opam +++ b/packages/ocaml-secondary-compiler/ocaml-secondary-compiler.4.14.2/opam @@ -7,21 +7,6 @@ homepage: "https://ocaml.org" bug-reports: "https://github.com/ocaml/opam-repository/issues" dev-repo: "git+https://github.com/ocaml/ocaml#4.14" depends: [ - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - "host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 / MSVC (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -31,8 +16,9 @@ depends: [ ("arch-x86_32" {os = "win32"} & (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) | "system-msvc")) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # Support Packages "flexdll" {>= "0.36" & os = "win32"} diff --git a/packages/ocaml-system/ocaml-system.4.13.0/opam b/packages/ocaml-system/ocaml-system.4.13.0/opam index 8a18c7ea3760..0210ac841f21 100644 --- a/packages/ocaml-system/ocaml-system.4.13.0/opam +++ b/packages/ocaml-system/ocaml-system.4.13.0/opam @@ -18,27 +18,17 @@ depends: [ "base-threads" {post} "base-bigarray" {post} - # Architecture - "host-arch-arm32" {?sys-ocaml-arch & sys-ocaml-arch = "arm" & post} - "host-arch-arm64" {?sys-ocaml-arch & sys-ocaml-arch = "arm64" & post} - "host-arch-ppc64" {?sys-ocaml-arch & sys-ocaml-arch = "power" & post} - "host-arch-riscv64" {?sys-ocaml-arch & sys-ocaml-arch = "riscv" & post} - "host-arch-s390x" {?sys-ocaml-arch & sys-ocaml-arch = "s390x" & post} - "host-arch-x86_32" {?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} - "host-arch-x86_64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} - "host-arch-unknown" {!(?sys-ocaml-arch) | - sys-ocaml-arch != "arm" & - sys-ocaml-arch != "arm64" & - sys-ocaml-arch != "power" & - sys-ocaml-arch != "riscv" & - sys-ocaml-arch != "s390x" & + # Architecture (Windows-only at present) + "host-arch-x86_32" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} + "host-arch-x86_64" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} + "host-arch-unknown" {os = "win32" & (!(?sys-ocaml-arch) | sys-ocaml-arch != "i686" & - sys-ocaml-arch != "x86_64" & post} + sys-ocaml-arch != "x86_64") & post} # System (Windows-only at present) - "host-system-mingw" {?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} - "host-system-msvc" {?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} - "host-system-other" {?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} + "host-system-mingw" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} + "host-system-msvc" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} + "host-system-other" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} # Environment configuration (Windows-only) # NB There are not "system" distributions of OCaml on Windows; the support diff --git a/packages/ocaml-system/ocaml-system.4.13.1/opam b/packages/ocaml-system/ocaml-system.4.13.1/opam index 6063f77bebbc..23458dd62a33 100644 --- a/packages/ocaml-system/ocaml-system.4.13.1/opam +++ b/packages/ocaml-system/ocaml-system.4.13.1/opam @@ -18,27 +18,17 @@ depends: [ "base-threads" {post} "base-bigarray" {post} - # Architecture - "host-arch-arm32" {?sys-ocaml-arch & sys-ocaml-arch = "arm" & post} - "host-arch-arm64" {?sys-ocaml-arch & sys-ocaml-arch = "arm64" & post} - "host-arch-ppc64" {?sys-ocaml-arch & sys-ocaml-arch = "power" & post} - "host-arch-riscv64" {?sys-ocaml-arch & sys-ocaml-arch = "riscv" & post} - "host-arch-s390x" {?sys-ocaml-arch & sys-ocaml-arch = "s390x" & post} - "host-arch-x86_32" {?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} - "host-arch-x86_64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} - "host-arch-unknown" {!(?sys-ocaml-arch) | - sys-ocaml-arch != "arm" & - sys-ocaml-arch != "arm64" & - sys-ocaml-arch != "power" & - sys-ocaml-arch != "riscv" & - sys-ocaml-arch != "s390x" & + # Architecture (Windows-only at present) + "host-arch-x86_32" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} + "host-arch-x86_64" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} + "host-arch-unknown" {os = "win32" & (!(?sys-ocaml-arch) | sys-ocaml-arch != "i686" & - sys-ocaml-arch != "x86_64" & post} + sys-ocaml-arch != "x86_64") & post} # System (Windows-only at present) - "host-system-mingw" {?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} - "host-system-msvc" {?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} - "host-system-other" {?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} + "host-system-mingw" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} + "host-system-msvc" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} + "host-system-other" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} # Environment configuration (Windows-only) # NB There are not "system" distributions of OCaml on Windows; the support diff --git a/packages/ocaml-system/ocaml-system.4.14.0/opam b/packages/ocaml-system/ocaml-system.4.14.0/opam index 97e5d3275cc4..af88842651f5 100644 --- a/packages/ocaml-system/ocaml-system.4.14.0/opam +++ b/packages/ocaml-system/ocaml-system.4.14.0/opam @@ -18,27 +18,17 @@ depends: [ "base-threads" {post} "base-bigarray" {post} - # Architecture - "host-arch-arm32" {?sys-ocaml-arch & sys-ocaml-arch = "arm" & post} - "host-arch-arm64" {?sys-ocaml-arch & sys-ocaml-arch = "arm64" & post} - "host-arch-ppc64" {?sys-ocaml-arch & sys-ocaml-arch = "power" & post} - "host-arch-riscv64" {?sys-ocaml-arch & sys-ocaml-arch = "riscv" & post} - "host-arch-s390x" {?sys-ocaml-arch & sys-ocaml-arch = "s390x" & post} - "host-arch-x86_32" {?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} - "host-arch-x86_64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} - "host-arch-unknown" {!(?sys-ocaml-arch) | - sys-ocaml-arch != "arm" & - sys-ocaml-arch != "arm64" & - sys-ocaml-arch != "power" & - sys-ocaml-arch != "riscv" & - sys-ocaml-arch != "s390x" & + # Architecture (Windows-only at present) + "host-arch-x86_32" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} + "host-arch-x86_64" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} + "host-arch-unknown" {os = "win32" & (!(?sys-ocaml-arch) | sys-ocaml-arch != "i686" & - sys-ocaml-arch != "x86_64" & post} + sys-ocaml-arch != "x86_64") & post} # System (Windows-only at present) - "host-system-mingw" {?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} - "host-system-msvc" {?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} - "host-system-other" {?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} + "host-system-mingw" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} + "host-system-msvc" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} + "host-system-other" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} # Environment configuration (Windows-only) # NB There are not "system" distributions of OCaml on Windows; the support diff --git a/packages/ocaml-system/ocaml-system.4.14.1/opam b/packages/ocaml-system/ocaml-system.4.14.1/opam index 390902f6d288..775076c811cc 100644 --- a/packages/ocaml-system/ocaml-system.4.14.1/opam +++ b/packages/ocaml-system/ocaml-system.4.14.1/opam @@ -18,27 +18,17 @@ depends: [ "base-threads" {post} "base-bigarray" {post} - # Architecture - "host-arch-arm32" {?sys-ocaml-arch & sys-ocaml-arch = "arm" & post} - "host-arch-arm64" {?sys-ocaml-arch & sys-ocaml-arch = "arm64" & post} - "host-arch-ppc64" {?sys-ocaml-arch & sys-ocaml-arch = "power" & post} - "host-arch-riscv64" {?sys-ocaml-arch & sys-ocaml-arch = "riscv" & post} - "host-arch-s390x" {?sys-ocaml-arch & sys-ocaml-arch = "s390x" & post} - "host-arch-x86_32" {?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} - "host-arch-x86_64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} - "host-arch-unknown" {!(?sys-ocaml-arch) | - sys-ocaml-arch != "arm" & - sys-ocaml-arch != "arm64" & - sys-ocaml-arch != "power" & - sys-ocaml-arch != "riscv" & - sys-ocaml-arch != "s390x" & + # Architecture (Windows-only at present) + "host-arch-x86_32" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} + "host-arch-x86_64" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} + "host-arch-unknown" {os = "win32" & (!(?sys-ocaml-arch) | sys-ocaml-arch != "i686" & - sys-ocaml-arch != "x86_64" & post} + sys-ocaml-arch != "x86_64") & post} # System (Windows-only at present) - "host-system-mingw" {?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} - "host-system-msvc" {?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} - "host-system-other" {?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} + "host-system-mingw" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} + "host-system-msvc" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} + "host-system-other" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} # Environment configuration (Windows-only) # NB There are not "system" distributions of OCaml on Windows; the support diff --git a/packages/ocaml-system/ocaml-system.4.14.2/opam b/packages/ocaml-system/ocaml-system.4.14.2/opam index f6a85a9e04ed..cdcd3da3828a 100644 --- a/packages/ocaml-system/ocaml-system.4.14.2/opam +++ b/packages/ocaml-system/ocaml-system.4.14.2/opam @@ -18,27 +18,17 @@ depends: [ "base-threads" {post} "base-bigarray" {post} - # Architecture - "host-arch-arm32" {?sys-ocaml-arch & sys-ocaml-arch = "arm" & post} - "host-arch-arm64" {?sys-ocaml-arch & sys-ocaml-arch = "arm64" & post} - "host-arch-ppc64" {?sys-ocaml-arch & sys-ocaml-arch = "power" & post} - "host-arch-riscv64" {?sys-ocaml-arch & sys-ocaml-arch = "riscv" & post} - "host-arch-s390x" {?sys-ocaml-arch & sys-ocaml-arch = "s390x" & post} - "host-arch-x86_32" {?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} - "host-arch-x86_64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} - "host-arch-unknown" {!(?sys-ocaml-arch) | - sys-ocaml-arch != "arm" & - sys-ocaml-arch != "arm64" & - sys-ocaml-arch != "power" & - sys-ocaml-arch != "riscv" & - sys-ocaml-arch != "s390x" & + # Architecture (Windows-only at present) + "host-arch-x86_32" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} + "host-arch-x86_64" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} + "host-arch-unknown" {os = "win32" & (!(?sys-ocaml-arch) | sys-ocaml-arch != "i686" & - sys-ocaml-arch != "x86_64" & post} + sys-ocaml-arch != "x86_64") & post} # System (Windows-only at present) - "host-system-mingw" {?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} - "host-system-msvc" {?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} - "host-system-other" {?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} + "host-system-mingw" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} + "host-system-msvc" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} + "host-system-other" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} # Environment configuration (Windows-only) # NB There are not "system" distributions of OCaml on Windows; the support diff --git a/packages/ocaml-system/ocaml-system.5.0.0/opam b/packages/ocaml-system/ocaml-system.5.0.0/opam index b9e4b616b83b..4a55fb2bf3a1 100644 --- a/packages/ocaml-system/ocaml-system.5.0.0/opam +++ b/packages/ocaml-system/ocaml-system.5.0.0/opam @@ -20,28 +20,18 @@ depends: [ "base-domains" {post} "base-nnp" {post} - # Architecture - "host-arch-arm32" {?sys-ocaml-arch & sys-ocaml-arch = "arm" & post} - "host-arch-arm64" {?sys-ocaml-arch & sys-ocaml-arch = "arm64" & post} - "host-arch-ppc64" {?sys-ocaml-arch & sys-ocaml-arch = "power" & post} - "host-arch-riscv64" {?sys-ocaml-arch & sys-ocaml-arch = "riscv" & post} - "host-arch-s390x" {?sys-ocaml-arch & sys-ocaml-arch = "s390x" & post} - "host-arch-x86_32" {?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} - "host-arch-x86_64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} - "host-arch-unknown" {!(?sys-ocaml-arch) | - sys-ocaml-arch != "arm" & - sys-ocaml-arch != "arm64" & - sys-ocaml-arch != "power" & - sys-ocaml-arch != "riscv" & - sys-ocaml-arch != "s390x" & + # Architecture (Windows-only at present) + "host-arch-x86_32" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} + "host-arch-x86_64" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} + "host-arch-unknown" {os = "win32" & (!(?sys-ocaml-arch) | sys-ocaml-arch != "i686" & - sys-ocaml-arch != "x86_64" & post} + sys-ocaml-arch != "x86_64") & post} # System (Windows-only at present) - "host-system-mingw" {?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} + "host-system-mingw" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} # There is no official MSVC support for 5.0.0 - "host-system-msvc" {?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} - "host-system-other" {?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} + "host-system-msvc" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} + "host-system-other" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} # Environment configuration (Windows-only) # NB There are not "system" distributions of OCaml on Windows; the support diff --git a/packages/ocaml-system/ocaml-system.5.1.0/opam b/packages/ocaml-system/ocaml-system.5.1.0/opam index ffd85a952238..0053c29ddccf 100644 --- a/packages/ocaml-system/ocaml-system.5.1.0/opam +++ b/packages/ocaml-system/ocaml-system.5.1.0/opam @@ -20,28 +20,18 @@ depends: [ "base-domains" {post} "base-nnp" {post} - # Architecture - "host-arch-arm32" {?sys-ocaml-arch & sys-ocaml-arch = "arm" & post} - "host-arch-arm64" {?sys-ocaml-arch & sys-ocaml-arch = "arm64" & post} - "host-arch-ppc64" {?sys-ocaml-arch & sys-ocaml-arch = "power" & post} - "host-arch-riscv64" {?sys-ocaml-arch & sys-ocaml-arch = "riscv" & post} - "host-arch-s390x" {?sys-ocaml-arch & sys-ocaml-arch = "s390x" & post} - "host-arch-x86_32" {?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} - "host-arch-x86_64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} - "host-arch-unknown" {!(?sys-ocaml-arch) | - sys-ocaml-arch != "arm" & - sys-ocaml-arch != "arm64" & - sys-ocaml-arch != "power" & - sys-ocaml-arch != "riscv" & - sys-ocaml-arch != "s390x" & + # Architecture (Windows-only at present) + "host-arch-x86_32" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} + "host-arch-x86_64" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} + "host-arch-unknown" {os = "win32" & (!(?sys-ocaml-arch) | sys-ocaml-arch != "i686" & - sys-ocaml-arch != "x86_64" & post} + sys-ocaml-arch != "x86_64") & post} # System (Windows-only at present) - "host-system-mingw" {?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} + "host-system-mingw" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} # There is no official MSVC support for 5.1.0 - "host-system-msvc" {?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} - "host-system-other" {?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} + "host-system-msvc" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} + "host-system-other" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} # Environment configuration (Windows-only) # NB There are not "system" distributions of OCaml on Windows; the support diff --git a/packages/ocaml-system/ocaml-system.5.1.1/opam b/packages/ocaml-system/ocaml-system.5.1.1/opam index 46e42575ae33..f99ec0697bf7 100644 --- a/packages/ocaml-system/ocaml-system.5.1.1/opam +++ b/packages/ocaml-system/ocaml-system.5.1.1/opam @@ -20,28 +20,18 @@ depends: [ "base-domains" {post} "base-nnp" {post} - # Architecture - "host-arch-arm32" {?sys-ocaml-arch & sys-ocaml-arch = "arm" & post} - "host-arch-arm64" {?sys-ocaml-arch & sys-ocaml-arch = "arm64" & post} - "host-arch-ppc64" {?sys-ocaml-arch & sys-ocaml-arch = "power" & post} - "host-arch-riscv64" {?sys-ocaml-arch & sys-ocaml-arch = "riscv" & post} - "host-arch-s390x" {?sys-ocaml-arch & sys-ocaml-arch = "s390x" & post} - "host-arch-x86_32" {?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} - "host-arch-x86_64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} - "host-arch-unknown" {!(?sys-ocaml-arch) | - sys-ocaml-arch != "arm" & - sys-ocaml-arch != "arm64" & - sys-ocaml-arch != "power" & - sys-ocaml-arch != "riscv" & - sys-ocaml-arch != "s390x" & + # Architecture (Windows-only at present) + "host-arch-x86_32" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} + "host-arch-x86_64" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} + "host-arch-unknown" {os = "win32" & (!(?sys-ocaml-arch) | sys-ocaml-arch != "i686" & - sys-ocaml-arch != "x86_64" & post} + sys-ocaml-arch != "x86_64") & post} # System (Windows-only at present) - "host-system-mingw" {?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} + "host-system-mingw" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} # There is no official MSVC support for 5.1.1 - "host-system-msvc" {?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} - "host-system-other" {?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} + "host-system-msvc" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} + "host-system-other" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} # Environment configuration (Windows-only) # NB There are not "system" distributions of OCaml on Windows; the support diff --git a/packages/ocaml-system/ocaml-system.5.2.0/opam b/packages/ocaml-system/ocaml-system.5.2.0/opam index dec2d66e42de..15737a1ef6ef 100644 --- a/packages/ocaml-system/ocaml-system.5.2.0/opam +++ b/packages/ocaml-system/ocaml-system.5.2.0/opam @@ -20,28 +20,18 @@ depends: [ "base-domains" {post} "base-nnp" {post} - # Architecture - "host-arch-arm32" {?sys-ocaml-arch & sys-ocaml-arch = "arm" & post} - "host-arch-arm64" {?sys-ocaml-arch & sys-ocaml-arch = "arm64" & post} - "host-arch-ppc64" {?sys-ocaml-arch & sys-ocaml-arch = "power" & post} - "host-arch-riscv64" {?sys-ocaml-arch & sys-ocaml-arch = "riscv" & post} - "host-arch-s390x" {?sys-ocaml-arch & sys-ocaml-arch = "s390x" & post} - "host-arch-x86_32" {?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} - "host-arch-x86_64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} - "host-arch-unknown" {!(?sys-ocaml-arch) | - sys-ocaml-arch != "arm" & - sys-ocaml-arch != "arm64" & - sys-ocaml-arch != "power" & - sys-ocaml-arch != "riscv" & - sys-ocaml-arch != "s390x" & + # Architecture (Windows-only at present) + "host-arch-x86_32" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} + "host-arch-x86_64" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} + "host-arch-unknown" {os = "win32" & (!(?sys-ocaml-arch) | sys-ocaml-arch != "i686" & - sys-ocaml-arch != "x86_64" & post} + sys-ocaml-arch != "x86_64") & post} # System (Windows-only at present) - "host-system-mingw" {?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} + "host-system-mingw" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} # There is no official MSVC support for 5.2.0 - "host-system-msvc" {?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} - "host-system-other" {?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} + "host-system-msvc" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} + "host-system-other" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} # Environment configuration (Windows-only) # NB There are not "system" distributions of OCaml on Windows; the support diff --git a/packages/ocaml-system/ocaml-system.5.2.1/opam b/packages/ocaml-system/ocaml-system.5.2.1/opam index c503fcf066ee..8d6dfceff72f 100644 --- a/packages/ocaml-system/ocaml-system.5.2.1/opam +++ b/packages/ocaml-system/ocaml-system.5.2.1/opam @@ -20,28 +20,18 @@ depends: [ "base-domains" {post} "base-nnp" {post} - # Architecture - "host-arch-arm32" {?sys-ocaml-arch & sys-ocaml-arch = "arm" & post} - "host-arch-arm64" {?sys-ocaml-arch & sys-ocaml-arch = "arm64" & post} - "host-arch-ppc64" {?sys-ocaml-arch & sys-ocaml-arch = "power" & post} - "host-arch-riscv64" {?sys-ocaml-arch & sys-ocaml-arch = "riscv" & post} - "host-arch-s390x" {?sys-ocaml-arch & sys-ocaml-arch = "s390x" & post} - "host-arch-x86_32" {?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} - "host-arch-x86_64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} - "host-arch-unknown" {!(?sys-ocaml-arch) | - sys-ocaml-arch != "arm" & - sys-ocaml-arch != "arm64" & - sys-ocaml-arch != "power" & - sys-ocaml-arch != "riscv" & - sys-ocaml-arch != "s390x" & + # Architecture (Windows-only at present) + "host-arch-x86_32" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} + "host-arch-x86_64" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} + "host-arch-unknown" {os = "win32" & (!(?sys-ocaml-arch) | sys-ocaml-arch != "i686" & - sys-ocaml-arch != "x86_64" & post} + sys-ocaml-arch != "x86_64") & post} # System (Windows-only at present) - "host-system-mingw" {?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} + "host-system-mingw" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} # There is no official MSVC support for 5.2.1 - "host-system-msvc" {?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} - "host-system-other" {?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} + "host-system-msvc" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} + "host-system-other" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} # Environment configuration (Windows-only) # NB There are not "system" distributions of OCaml on Windows; the support diff --git a/packages/ocaml-variants/ocaml-variants.4.13.0+options/opam b/packages/ocaml-variants/ocaml-variants.4.13.0+options/opam index 2de8f6c49803..bb451b011eda 100644 --- a/packages/ocaml-variants/ocaml-variants.4.13.0+options/opam +++ b/packages/ocaml-variants/ocaml-variants.4.13.0+options/opam @@ -18,22 +18,6 @@ depends: [ "base-bigarray" {post} "base-threads" {post} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - ("host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} | - ("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"})) - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 / MSVC (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -43,8 +27,9 @@ depends: [ ("arch-x86_32" {os = "win32"} & (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) | "system-msvc")) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # Support Packages "flexdll" {>= "0.36" & os = "win32"} diff --git a/packages/ocaml-variants/ocaml-variants.4.13.1+options/opam b/packages/ocaml-variants/ocaml-variants.4.13.1+options/opam index 795492db797f..fb19fc8a2d21 100644 --- a/packages/ocaml-variants/ocaml-variants.4.13.1+options/opam +++ b/packages/ocaml-variants/ocaml-variants.4.13.1+options/opam @@ -18,22 +18,6 @@ depends: [ "base-bigarray" {post} "base-threads" {post} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - ("host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} | - ("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"})) - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 / MSVC (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -43,8 +27,9 @@ depends: [ ("arch-x86_32" {os = "win32"} & (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) | "system-msvc")) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # Support Packages "flexdll" {>= "0.36" & os = "win32"} diff --git a/packages/ocaml-variants/ocaml-variants.4.14.0+options/opam b/packages/ocaml-variants/ocaml-variants.4.14.0+options/opam index 4d737e3825bd..0bb6b1bbd590 100644 --- a/packages/ocaml-variants/ocaml-variants.4.14.0+options/opam +++ b/packages/ocaml-variants/ocaml-variants.4.14.0+options/opam @@ -18,22 +18,6 @@ depends: [ "base-bigarray" {post} "base-threads" {post} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - ("host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} | - ("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"})) - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 / MSVC (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -43,8 +27,9 @@ depends: [ ("arch-x86_32" {os = "win32"} & (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) | "system-msvc")) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # Support Packages "flexdll" {>= "0.36" & os = "win32"} diff --git a/packages/ocaml-variants/ocaml-variants.4.14.1+options/opam b/packages/ocaml-variants/ocaml-variants.4.14.1+options/opam index 8bb94244027d..352b36298c75 100644 --- a/packages/ocaml-variants/ocaml-variants.4.14.1+options/opam +++ b/packages/ocaml-variants/ocaml-variants.4.14.1+options/opam @@ -18,22 +18,6 @@ depends: [ "base-bigarray" {post} "base-threads" {post} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - ("host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} | - ("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"})) - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 / MSVC (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -43,8 +27,9 @@ depends: [ ("arch-x86_32" {os = "win32"} & (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) | "system-msvc")) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # Support Packages "flexdll" {>= "0.36" & os = "win32"} diff --git a/packages/ocaml-variants/ocaml-variants.4.14.2+options/opam b/packages/ocaml-variants/ocaml-variants.4.14.2+options/opam index 11a0844b636d..6e0c5b7673f0 100644 --- a/packages/ocaml-variants/ocaml-variants.4.14.2+options/opam +++ b/packages/ocaml-variants/ocaml-variants.4.14.2+options/opam @@ -18,22 +18,6 @@ depends: [ "base-bigarray" {post} "base-threads" {post} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - ("host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} | - ("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"})) - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 / MSVC (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -43,8 +27,9 @@ depends: [ ("arch-x86_32" {os = "win32"} & (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) | "system-msvc")) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # Support Packages "flexdll" {>= "0.36" & os = "win32"} diff --git a/packages/ocaml-variants/ocaml-variants.5.0.0+options/opam b/packages/ocaml-variants/ocaml-variants.5.0.0+options/opam index da0d4ca64a72..89b34f8d0fbe 100644 --- a/packages/ocaml-variants/ocaml-variants.5.0.0+options/opam +++ b/packages/ocaml-variants/ocaml-variants.5.0.0+options/opam @@ -27,22 +27,6 @@ depends: [ "base-domains" {post} "base-nnp" {post} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - ("host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} | - ("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"})) - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 only (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -50,8 +34,9 @@ depends: [ # i686 mingw-w64 only ("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" {os = "win32"} & "system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # Only amd64 and arm64 support the native compiler "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64"} @@ -82,7 +67,6 @@ build: [ "--disable-native-compiler" {ocaml-option-bytecode-only:installed} "--disable-flat-float-array" {ocaml-option-no-flat-float-array:installed} "--enable-flambda" {ocaml-option-flambda:installed} - "--enable-frame-pointers" {ocaml-option-fp:installed} "CC=cc" {!ocaml-option-32bit:installed & !ocaml-option-musl:installed & (os="openbsd"|os="macos")} "CC=musl-gcc" {ocaml-option-musl:installed & os-distribution!="alpine"} "CFLAGS=-Os" {ocaml-option-musl:installed & arch!="arm64"} diff --git a/packages/ocaml-variants/ocaml-variants.5.1.0+options/opam b/packages/ocaml-variants/ocaml-variants.5.1.0+options/opam index 35e1954a22ce..1784467d0cf6 100644 --- a/packages/ocaml-variants/ocaml-variants.5.1.0+options/opam +++ b/packages/ocaml-variants/ocaml-variants.5.1.0+options/opam @@ -27,22 +27,6 @@ depends: [ "base-domains" {post} "base-nnp" {post} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - ("host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} | - ("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"})) - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 only (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -50,8 +34,9 @@ depends: [ # i686 mingw-w64 only ("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" {os = "win32"} & "system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # POWER and all the 32-bit architectures are bytecode-only "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64" & arch != "s390x" & arch != "riscv64"} diff --git a/packages/ocaml-variants/ocaml-variants.5.1.1+effect-syntax/opam b/packages/ocaml-variants/ocaml-variants.5.1.1+effect-syntax/opam index ec0c74f9328a..a57e21d544e2 100644 --- a/packages/ocaml-variants/ocaml-variants.5.1.1+effect-syntax/opam +++ b/packages/ocaml-variants/ocaml-variants.5.1.1+effect-syntax/opam @@ -30,22 +30,6 @@ depends: [ "ocaml-beta" {opam-version < "2.1.0"} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - ("host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} | - ("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"})) - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 only (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -53,8 +37,9 @@ depends: [ # i686 mingw-w64 only ("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" {os = "win32"} & "system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # POWER and all the 32-bit architectures are bytecode-only "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64" & arch != "s390x" & arch != "riscv64"} diff --git a/packages/ocaml-variants/ocaml-variants.5.1.1+options/opam b/packages/ocaml-variants/ocaml-variants.5.1.1+options/opam index 8943613d7c21..79e66c168e84 100644 --- a/packages/ocaml-variants/ocaml-variants.5.1.1+options/opam +++ b/packages/ocaml-variants/ocaml-variants.5.1.1+options/opam @@ -27,22 +27,6 @@ depends: [ "base-domains" {post} "base-nnp" {post} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - ("host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} | - ("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"})) - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 only (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -50,8 +34,9 @@ depends: [ # i686 mingw-w64 only ("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" {os = "win32"} & "system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # POWER and all the 32-bit architectures are bytecode-only "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64" & arch != "s390x" & arch != "riscv64"} diff --git a/packages/ocaml-variants/ocaml-variants.5.2.0+options/opam b/packages/ocaml-variants/ocaml-variants.5.2.0+options/opam index ba6586014f2c..cc5a95f8c58e 100644 --- a/packages/ocaml-variants/ocaml-variants.5.2.0+options/opam +++ b/packages/ocaml-variants/ocaml-variants.5.2.0+options/opam @@ -27,22 +27,6 @@ depends: [ "base-domains" {post} "base-nnp" {post} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - ("host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} | - ("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"})) - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 only (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -50,8 +34,9 @@ depends: [ # i686 mingw-w64 only ("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" {os = "win32"} & "system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # All the 32-bit architectures are bytecode-only "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64" & arch != "s390x" & arch != "riscv64" & arch != "ppc64"} diff --git a/packages/ocaml-variants/ocaml-variants.5.2.0+statmemprof/opam b/packages/ocaml-variants/ocaml-variants.5.2.0+statmemprof/opam index f13c864fc620..11c1899d40de 100644 --- a/packages/ocaml-variants/ocaml-variants.5.2.0+statmemprof/opam +++ b/packages/ocaml-variants/ocaml-variants.5.2.0+statmemprof/opam @@ -29,22 +29,6 @@ depends: [ "ocaml-beta" {opam-version < "2.1.0"} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - ("host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} | - ("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"})) - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 only (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -52,8 +36,9 @@ depends: [ # i686 mingw-w64 only ("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" {os = "win32"} & "system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # All the 32-bit architectures are bytecode-only "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64" & arch != "s390x" & arch != "riscv64" & arch != "ppc64"} diff --git a/packages/ocaml-variants/ocaml-variants.5.2.1+options/opam b/packages/ocaml-variants/ocaml-variants.5.2.1+options/opam index b3cd34b7bfe9..56650f1ad64d 100644 --- a/packages/ocaml-variants/ocaml-variants.5.2.1+options/opam +++ b/packages/ocaml-variants/ocaml-variants.5.2.1+options/opam @@ -27,22 +27,6 @@ depends: [ "base-domains" {post} "base-nnp" {post} - # Architecture (non-Windows) - # opam-repository at present requires that ocaml-base-compiler is installed - # using an architecture which matches the machine's, since arch is used in - # available fields. Cross-compilation at this stage is an unstable accident. - "host-arch-arm32" {arch = "arm32" & post} - "host-arch-arm64" {arch = "arm64" & post} - "host-arch-ppc64" {arch = "ppc64" & post} - "host-arch-riscv64" {arch = "riscv64" & post} - "host-arch-s390x" {arch = "s390x" & post} - # The Windows ports explicitly select the architecture (see below) this - # facility is not yet available for other platforms. - "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post} - ("host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} | - ("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"})) - "host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post} - # Port selection (Windows) # amd64 mingw-w64 only (("arch-x86_64" {os = "win32" & arch = "x86_64"} & @@ -50,8 +34,9 @@ depends: [ # i686 mingw-w64 only ("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" {os = "win32"} & "system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) | - # Non-Windows systems - "host-system-other" {os != "win32" & post}) + # Non-Windows systems need to install something to satisfy this formula, so + # repeat the base-unix dependency + "base-unix" {os != "win32" & post}) # All the 32-bit architectures are bytecode-only "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64" & arch != "s390x" & arch != "riscv64" & arch != "ppc64"}