Merge pull request #28794 from dra27/5.0.0-tsan

mseri · web-flow · commit 641c526378cd · 2025-10-30T16:42:39.000+01:00
Add missing `conf-unwind` dependency to `ocaml-variants.5.0.0+tsan` backport
diff --git a/packages/ocaml-variants/ocaml-variants.5.0.0+tsan/opam b/packages/ocaml-variants/ocaml-variants.5.0.0+tsan/opam
@@ -17,6 +17,7 @@ depends: [
   "base-domains" {post}
   "base-nnp" {post}
   "ocaml-beta" {opam-version < "2.1.0"}
+  "conf-unwind"
 ]
 conflict-class: "ocaml-core-compiler"
 flags: [ compiler avoid-version ]

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ depends: [`
`17`	`17`	`"base-domains" {post}`
`18`	`18`	`"base-nnp" {post}`
`19`	`19`	`"ocaml-beta" {opam-version < "2.1.0"}`
	`20`	`+ "conf-unwind"`
`20`	`21`	`]`
`21`	`22`	`conflict-class: "ocaml-core-compiler"`
`22`	`23`	`flags: [ compiler avoid-version ]`