Merge pull request ocaml#22726 from kit-ty-kate/fix-172

kit-ty-kate · web-flow · commit 83a921342cc9 · 2022-12-19T19:27:29.000Z
js_of_ocaml &gt;= 3.7.0 does not support bytecode-only compilers
diff --git a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.3.10.0/opam b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.3.10.0/opam
@@ -27,6 +27,7 @@ conflicts: [
   "ocamlfind" {< "1.5.1"}
   "js_of_ocaml" {< "3.0"}
   "base-domains"
+  "ocaml-option-bytecode-only"
 ]
 dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git"
 build: [
diff --git a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.3.11.0/opam b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.3.11.0/opam
@@ -28,6 +28,7 @@ conflicts: [
   "ocamlfind" {< "1.5.1"}
   "js_of_ocaml" {< "3.0"}
   "base-domains"
+  "ocaml-option-bytecode-only"
 ]
 dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git"
 build: [
diff --git a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.3.7.0/opam b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.3.7.0/opam
@@ -29,6 +29,7 @@ conflicts: [
   "ocamlfind"   {< "1.5.1"}
   "js_of_ocaml" {< "3.0"}
   "base-domains"
+  "ocaml-option-bytecode-only"
 ]
 x-commit-hash: "d50221f1cf19f7637dfca7407762a85dcd420f46"
 url {
diff --git a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.3.7.1/opam b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.3.7.1/opam
@@ -29,6 +29,7 @@ conflicts: [
   "ocamlfind"   {< "1.5.1"}
   "js_of_ocaml" {< "3.0"}
   "base-domains"
+  "ocaml-option-bytecode-only"
 ]
 x-commit-hash: "888697ba6c17051c50839e35d882a8c58fdc69f5"
 url {
diff --git a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.3.8.0/opam b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.3.8.0/opam
@@ -29,6 +29,7 @@ conflicts: [
   "ocamlfind"   {< "1.5.1"}
   "js_of_ocaml" {< "3.0"}
   "base-domains"
+  "ocaml-option-bytecode-only"
 ]
 x-commit-hash: "09d5731241917577e9c16b6a0063c23baae00df8"
 url {
diff --git a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.3.9.0/opam b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.3.9.0/opam
@@ -29,6 +29,7 @@ conflicts: [
   "ocamlfind"   {< "1.5.1"}
   "js_of_ocaml" {< "3.0"}
   "base-domains"
+  "ocaml-option-bytecode-only"
 ]
 x-commit-hash: "95bc95d31122bae5764022f878d8a6dd95ceb169"
 url {
diff --git a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.3.9.1/opam b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.3.9.1/opam
@@ -29,6 +29,7 @@ conflicts: [
   "ocamlfind"   {< "1.5.1"}
   "js_of_ocaml" {< "3.0"}
   "base-domains"
+  "ocaml-option-bytecode-only"
 ]
 x-commit-hash: "c97f2543ff7bfa6c8fe683cca7beec884b38f918"
 url {
diff --git a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.4.0.0/opam b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.4.0.0/opam
@@ -28,6 +28,7 @@ conflicts: [
   "ocamlfind" {< "1.5.1"}
   "js_of_ocaml" {< "3.0"}
   "base-domains"
+  "ocaml-option-bytecode-only"
 ]
 dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git"
 build: [
diff --git a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.4.1.0/opam b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.4.1.0/opam
@@ -28,6 +28,7 @@ conflicts: [
   "ocamlfind" {< "1.5.1"}
   "js_of_ocaml" {< "3.0"}
   "ocaml-variants" {= "4.12.0+domains" | = "4.12.0+domains+effects"}
+  "ocaml-option-bytecode-only"
 ]
 dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git"
 build: [

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ conflicts: [`
`27`	`27`	`"ocamlfind" {< "1.5.1"}`
`28`	`28`	`"js_of_ocaml" {< "3.0"}`
`29`	`29`	`"base-domains"`
	`30`	`+ "ocaml-option-bytecode-only"`
`30`	`31`	`]`
`31`	`32`	`dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git"`
`32`	`33`	`build: [`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ conflicts: [`
`28`	`28`	`"ocamlfind" {< "1.5.1"}`
`29`	`29`	`"js_of_ocaml" {< "3.0"}`
`30`	`30`	`"base-domains"`
	`31`	`+ "ocaml-option-bytecode-only"`
`31`	`32`	`]`
`32`	`33`	`dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git"`
`33`	`34`	`build: [`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ conflicts: [`
`29`	`29`	`"ocamlfind" {< "1.5.1"}`
`30`	`30`	`"js_of_ocaml" {< "3.0"}`
`31`	`31`	`"base-domains"`
	`32`	`+ "ocaml-option-bytecode-only"`
`32`	`33`	`]`
`33`	`34`	`x-commit-hash: "d50221f1cf19f7637dfca7407762a85dcd420f46"`
`34`	`35`	`url {`