Merge pull request #28787 from ocaml/mseri-patch-1

mseri · web-flow · commit 7f9c784b97b3 · 2025-10-27T23:36:48.000+01:00
ocaml 5.4.0 should not be "avoid-version"
diff --git a/packages/ocaml/ocaml.5.4.0/opam b/packages/ocaml/ocaml.5.4.0/opam
@@ -23,7 +23,7 @@ depends: [
   "ocaml-system" {>= "5.4.0~" & < "5.4.1~"} |
   "dkml-base-compiler" {>= "5.4.0~" & < "5.4.1~"}
 ]
-flags: [conf avoid-version]
+flags: [conf]
 setenv: [
   [OCAMLTOP_INCLUDE_PATH += "%{toplevel}%"]
   [CAML_LD_LIBRARY_PATH = "%{_:stubsdir}%"]

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ depends: [`
`23`	`23`	`"ocaml-system" {>= "5.4.0~" & < "5.4.1~"} \|`
`24`	`24`	`"dkml-base-compiler" {>= "5.4.0~" & < "5.4.1~"}`
`25`	`25`	`]`
`26`		`-flags: [conf avoid-version]`
	`26`	`+flags: [conf]`
`27`	`27`	`setenv: [`
`28`	`28`	`[OCAMLTOP_INCLUDE_PATH += "%{toplevel}%"]`
`29`	`29`	`[CAML_LD_LIBRARY_PATH = "%{_:stubsdir}%"]`