Merge pull request ocaml#22704 from kit-ty-kate/fix-171

kit-ty-kate · web-flow · commit 40323065c22c · 2022-12-16T21:41:32.000Z
Mark all versions of llvm as not compatible with OCaml 5.0
diff --git a/packages/llvm/llvm.3.4/opam b/packages/llvm/llvm.3.4/opam
@@ -22,6 +22,10 @@ depends: [
   "ocaml"
   "ocamlbuild" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 install: ["sh" "./compile.sh" "install" "3.4" make prefix lib]
 synopsis: "The official LLVM binding"
 description: "Note: LLVM should be installed first."
diff --git a/packages/llvm/llvm.3.5/opam b/packages/llvm/llvm.3.5/opam
@@ -22,6 +22,10 @@ depends: [
   "ocaml"
   "ocamlbuild" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 install: ["sh" "./compile.sh" "install" "3.5" make prefix lib]
 synopsis: "The official LLVM binding"
 description: "Note: LLVM should be installed first."
diff --git a/packages/llvm/llvm.3.6/opam b/packages/llvm/llvm.3.6/opam
@@ -16,6 +16,10 @@ depends: [
   "ounit" {with-test}
   "ocamlbuild" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 depexts: [
   ["llvm-3.6-dev"] {os-family = "debian"}
   ["homebrew/versions/llvm36"] {os = "macos" & os-distribution = "homebrew"}
diff --git a/packages/llvm/llvm.3.7/opam b/packages/llvm/llvm.3.7/opam
@@ -17,6 +17,10 @@ depends: [
   "ounit" {with-test}
   "ocamlbuild" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 depexts: [
   ["llvm-3.7-dev"] {os-family = "debian"}
   ["homebrew/versions/llvm37"] {os = "macos" & os-distribution = "homebrew"}
diff --git a/packages/llvm/llvm.3.8/opam b/packages/llvm/llvm.3.8/opam
@@ -19,6 +19,10 @@ depends: [
   "conf-llvm" {build & = "3.8"}
   "conf-python-2-7" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 synopsis: "The OCaml bindings distributed with LLVM"
 description: "Note: LLVM should be installed first."
 flags: light-uninstall
diff --git a/packages/llvm/llvm.3.9/opam b/packages/llvm/llvm.3.9/opam
@@ -33,6 +33,10 @@ depends: [
   "conf-python-2-7" {build}
   "conf-cmake" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 synopsis: "The OCaml bindings distributed with LLVM"
 description: "Note: LLVM should be installed first."
 extra-files: [
diff --git a/packages/llvm/llvm.4.0.0/opam b/packages/llvm/llvm.4.0.0/opam
@@ -25,6 +25,10 @@ depends: [
   "conf-python-2-7" {build}
   "conf-cmake" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 synopsis: "The OCaml bindings distributed with LLVM"
 description: "Note: LLVM should be installed first."
 extra-files: [
diff --git a/packages/llvm/llvm.5.0.0/opam b/packages/llvm/llvm.5.0.0/opam
@@ -26,6 +26,10 @@ depends: [
   "conf-python-2-7" {build}
   "conf-cmake" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 patches: [
   "fix-shared.patch"
 ]
diff --git a/packages/llvm/llvm.6.0.0/opam b/packages/llvm/llvm.6.0.0/opam
@@ -26,6 +26,10 @@ depends: [
   "conf-python-2-7" {build}
   "conf-cmake" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 patches: [
   "fix-shared.patch"
 ]
diff --git a/packages/llvm/llvm.7.0.0/opam b/packages/llvm/llvm.7.0.0/opam
@@ -26,6 +26,10 @@ depends: [
   "conf-python-2-7" {build}
   "conf-cmake" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 patches: [
   "fix-shared.patch"
 ]
diff --git a/packages/llvm/llvm.8.0.0/opam b/packages/llvm/llvm.8.0.0/opam
@@ -21,6 +21,10 @@ depends: [
   "conf-python-2-7" {build}
   "conf-cmake" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 patches: [
   "fix-shared.patch"
 ]
diff --git a/packages/llvm/llvm.9.0.0/opam b/packages/llvm/llvm.9.0.0/opam
@@ -21,6 +21,10 @@ depends: [
   "conf-python-2-7" {build}
   "conf-cmake" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 patches: [
   "fix-shared.patch"
 ]

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,10 @@ depends: [`
`26`	`26`	`"conf-python-2-7" {build}`
`27`	`27`	`"conf-cmake" {build}`
`28`	`28`	`]`
	`29`	`+conflicts: [`
	`30`	`+ "base-nnp"`
	`31`	`+ "ocaml-option-nnpchecker"`
	`32`	`+]`
`29`	`33`	`patches: [`
`30`	`34`	`"fix-shared.patch"`
`31`	`35`	`]`