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

avsm · web-flow · commit 176a6ff2b44b · 2023-07-11T10:51:41.000+01:00
Correct the bytecode architectures for OCaml 5.1 and OCaml 5.2 (trunk)
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"

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ depends: [`
`14`	`14`	`"base-domains" {post}`
`15`	`15`	`"base-nnp" {post}`
`16`	`16`	`"ocaml-options-vanilla" {post}`
	`17`	`+ "ocaml-option-bytecode-only" {arch = "ppc64" \| arch = "s390x"}`
`17`	`18`	`"ocaml-beta" {opam-version < "2.1.0"}`
`18`	`19`	`]`
`19`	`20`	`conflict-class: "ocaml-core-compiler"`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ depends: [`
`13`	`13`	`"base-threads" {post}`
`14`	`14`	`"base-domains" {post}`
`15`	`15`	`"base-nnp" {post}`
`16`		`- "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64"}`
	`16`	`+ "ocaml-option-bytecode-only" {arch = "ppc64"}`
`17`	`17`	`"ocaml-beta" {opam-version < "2.1.0"}`
`18`	`18`	`]`
`19`	`19`	`conflict-class: "ocaml-core-compiler"`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ depends: [`
`13`	`13`	`"base-threads" {post}`
`14`	`14`	`"base-domains" {post}`
`15`	`15`	`"base-nnp" {post}`
`16`		`- "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64"}`
`17`	`16`	`"ocaml-beta" {opam-version < "2.1.0"}`
`18`	`17`	`]`
`19`	`18`	`conflict-class: "ocaml-core-compiler"`