Merge pull request ocaml#22703 from dra27/more-bytecode

kit-ty-kate · web-flow · commit 430d244d8147 · 2022-12-16T21:09:24.000Z
Correct the OCaml 5 bytecode no-flat-float-array packages
diff --git a/packages/ocaml-options-only-no-flat-float-array/ocaml-options-only-no-flat-float-array.1+bytecode-only/opam b/packages/ocaml-options-only-no-flat-float-array/ocaml-options-only-no-flat-float-array.1+bytecode-only/opam
@@ -3,7 +3,7 @@ synopsis: "Ensure that OCaml is compiled with no-flat-float-array, and no other
 depends: [
   "ocaml-option-no-flat-float-array"
   "ocaml-option-bytecode-only"
-  "ocaml-variants" {post & (>= "5.00.0~~" & arch != "x86_64" & arch != "arm64")}
+  "ocaml-variants" {post & >= "5.0.0~~"}
 ]
 conflicts: [
   "ocaml-option-32bit"
@@ -19,3 +19,4 @@ conflicts: [
 ]
 maintainer: "platform@lists.ocaml.org"
 flags: compiler
+available: arch != "x86_64" & arch != "arm64"
diff --git a/packages/ocaml-options-only-no-flat-float-array/ocaml-options-only-no-flat-float-array.1/opam b/packages/ocaml-options-only-no-flat-float-array/ocaml-options-only-no-flat-float-array.1/opam
@@ -2,7 +2,7 @@ opam-version: "2.0"
 synopsis: "Ensure that OCaml is compiled with no-flat-float-array, and no other custom options"
 depends: [
   "ocaml-option-no-flat-float-array"
-  "ocaml-variants" {post & (< "5.00.0~~" | arch = "x86_64" | arch = "arm64")}
+  "ocaml-variants" {post & < "5.0.0~~" & arch != "x86_64" & arch != "arm64"}
 ]
 conflicts: [
   "ocaml-option-32bit"

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ synopsis: "Ensure that OCaml is compiled with no-flat-float-array, and no other`
`3`	`3`	`depends: [`
`4`	`4`	`"ocaml-option-no-flat-float-array"`
`5`	`5`	`"ocaml-option-bytecode-only"`
`6`		`- "ocaml-variants" {post & (>= "5.00.0~~" & arch != "x86_64" & arch != "arm64")}`
	`6`	`+ "ocaml-variants" {post & >= "5.0.0~~"}`
`7`	`7`	`]`
`8`	`8`	`conflicts: [`
`9`	`9`	`"ocaml-option-32bit"`
`@@ -19,3 +19,4 @@ conflicts: [`
`19`	`19`	`]`
`20`	`20`	`maintainer: "[email protected]"`
`21`	`21`	`flags: compiler`
	`22`	`+available: arch != "x86_64" & arch != "arm64"`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ opam-version: "2.0"`
`2`	`2`	`synopsis: "Ensure that OCaml is compiled with no-flat-float-array, and no other custom options"`
`3`	`3`	`depends: [`
`4`	`4`	`"ocaml-option-no-flat-float-array"`
`5`		`- "ocaml-variants" {post & (< "5.00.0~~" \| arch = "x86_64" \| arch = "arm64")}`
	`5`	`+ "ocaml-variants" {post & < "5.0.0~~" & arch != "x86_64" & arch != "arm64"}`
`6`	`6`	`]`
`7`	`7`	`conflicts: [`
`8`	`8`	`"ocaml-option-32bit"`