Merge pull request #24075 from dra27/5.x-restored-arches

Correct the bytecode architectures for OCaml 5.1 and OCaml 5.2 (trunk)
ocaml · Jul 11, 2023 · 176a6ff · 176a6ff
2 parents 1105394 + 3985a57
commit 176a6ff
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 5 deletions.
diff --git a/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0~alpha1/opam b/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0~alpha1/opam
@@ -14,6 +14,7 @@ depends: [
   "base-domains" {post}
   "base-nnp" {post}
   "ocaml-options-vanilla" {post}
+  "ocaml-option-bytecode-only" {arch = "ppc64" | arch = "s390x"}
   "ocaml-beta" {opam-version < "2.1.0"}
 ]
 conflict-class: "ocaml-core-compiler"

diff --git a/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0~alpha2/opam b/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0~alpha2/opam
@@ -14,6 +14,7 @@ depends: [
   "base-domains" {post}
   "base-nnp" {post}
   "ocaml-options-vanilla" {post}
+  "ocaml-option-bytecode-only" {arch = "ppc64"}
   "ocaml-beta" {opam-version < "2.1.0"}
 ]
 conflict-class: "ocaml-core-compiler"

diff --git a/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0~beta1/opam b/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0~beta1/opam
@@ -14,6 +14,7 @@ depends: [
   "base-domains" {post}
   "base-nnp" {post}
   "ocaml-options-vanilla" {post}
+  "ocaml-option-bytecode-only" {arch = "ppc64"}
   "ocaml-beta" {opam-version < "2.1.0"}
 ]
 conflict-class: "ocaml-core-compiler"

diff --git a/packages/ocaml-variants/ocaml-variants.5.1.0+trunk/opam b/packages/ocaml-variants/ocaml-variants.5.1.0+trunk/opam
@@ -13,7 +13,7 @@ depends: [
   "base-threads" {post}
   "base-domains" {post}
   "base-nnp" {post}
-  "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64"}
+  "ocaml-option-bytecode-only" {arch = "ppc64"}
   "ocaml-beta" {opam-version < "2.1.0"}
 ]
 conflict-class: "ocaml-core-compiler"

diff --git a/packages/ocaml-variants/ocaml-variants.5.1.0~alpha1+options/opam b/packages/ocaml-variants/ocaml-variants.5.1.0~alpha1+options/opam
@@ -13,7 +13,7 @@ depends: [
   "base-threads" {post}
   "base-domains" {post}
   "base-nnp" {post}
-  "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64"}
+  "ocaml-option-bytecode-only" {arch = "ppc64" | arch = "s390x"}
   "ocaml-beta" {opam-version < "2.1.0"}
 ]
 conflict-class: "ocaml-core-compiler"

diff --git a/packages/ocaml-variants/ocaml-variants.5.1.0~alpha2+options/opam b/packages/ocaml-variants/ocaml-variants.5.1.0~alpha2+options/opam
@@ -13,7 +13,7 @@ depends: [
   "base-threads" {post}
   "base-domains" {post}
   "base-nnp" {post}
-  "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64" & arch != "s390x" & arch != "riscv" }
+  "ocaml-option-bytecode-only" {arch = "ppc64"}
   "ocaml-beta" {opam-version < "2.1.0"}
 ]
 conflict-class: "ocaml-core-compiler"

diff --git a/packages/ocaml-variants/ocaml-variants.5.1.0~beta1+options/opam b/packages/ocaml-variants/ocaml-variants.5.1.0~beta1+options/opam
@@ -13,7 +13,7 @@ depends: [
   "base-threads" {post}
   "base-domains" {post}
   "base-nnp" {post}
-  "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64" & arch != "s390x" & arch != "riscv" }
+  "ocaml-option-bytecode-only" {arch = "ppc64"}
   "ocaml-beta" {opam-version < "2.1.0"}
 ]
 conflict-class: "ocaml-core-compiler"

diff --git a/packages/ocaml-variants/ocaml-variants.5.2.0+trunk/opam b/packages/ocaml-variants/ocaml-variants.5.2.0+trunk/opam
@@ -13,7 +13,6 @@ depends: [
   "base-threads" {post}
   "base-domains" {post}
   "base-nnp" {post}
-  "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64"}
   "ocaml-beta" {opam-version < "2.1.0"}
 ]
 conflict-class: "ocaml-core-compiler"