support more opam versions for flambda2 variant

ocaml · Jun 17, 2024 · 9871990 · 9871990
1 parent 4ef6f79
commit 9871990
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/packages/dune-secondary/dune-secondary.3.8.1/opam b/packages/dune-secondary/dune-secondary.3.8.1/opam
@@ -37,11 +37,14 @@ conflicts: [
 dev-repo: "git+https://github.com/ocaml/dune.git"
 build-env: [PATH += "%{ocaml-secondary-compiler:share}%/bin"]
 build: [
-  ["ocaml" "boot/bootstrap.ml" "-j" jobs]
-  ["./_boot/dune.exe" "build" "dune.install" "--release" "--profile" "dune-bootstrap" "-j" jobs]
+  ["sh" "-exc" "PATH=%{ocaml-secondary-compiler:share}%/bin ocaml boot/bootstrap.ml -j %{jobs}%"] { opam-version < "2.1.5"}
+  ["ocaml" "boot/bootstrap.ml" "-j" jobs] { opam-version >= "2.1.5" }
+  ["sh" "-exc" "PATH=%{ocaml-secondary-compiler:share}%/bin ./_boot/dune.exe build dune.install --release --profile dune-bootstrap -j %{jobs}%" ] { opam-version < "2.1.5" }
+  ["./_boot/dune.exe" "build" "dune.install" "--release" "--profile" "dune-bootstrap" "-j" jobs] { opam-version >= "2.1.5" }
 ]
 install: [
-  ["./_boot/dune.exe" "install" "dune" "--prefix" "%{ocaml-secondary-compiler:share}%"]
+  ["./_boot/dune.exe" "install" "dune" "--prefix" "%{ocaml-secondary-compiler:share}%"] { opam-version >= "2.1.5" }
+  ["sh" "-exc" "PATH=%{ocaml-secondary-compiler:share}%/bin ./_boot/dune.exe install dune --prefix %{ocaml-secondary-compiler:share}%"] { opam-version < "2.1.5" }
 ]
 depends: [
   "ocaml-secondary-compiler" {>="4.14.1"}
@@ -55,4 +58,3 @@ url {
     "sha512=6857b64e7ca8ba452937539d5996c8d0941b25d82313cfad9e1e6b835a04fb86605beccdc86400cc705ad6a969171524091ab6981df87629b542cc172b38746b"
   ]
 }
-available: opam-version >= "2.1.5"
diff --git a/packages/menhir-secondary/menhir-secondary.20210419/opam b/packages/menhir-secondary/menhir-secondary.20210419/opam
@@ -12,10 +12,12 @@ build-env: [
   [PATH += "%{ocaml-secondary-compiler:share}%/bin"]
 ]
 build: [
-  ["dune" "build"]
+  ["dune" "build"] { opam-version >= "2.1.5" }
+  ["sh" "-exc" "PATH=%{ocaml-secondary-compiler:share}%/bin dune build"] { opam-version < "2.1.5"}
 ]
 install: [
-  ["dune" "install" "--prefix" ocaml-secondary-compiler:share]
+  ["sh" "-exc" "PATH=%{ocaml-secondary-compiler:share}%/bin dune install --prefix %{ocaml-secondary-compiler:share}%"] { opam-version < "2.1.5"}
+  ["dune" "install" "--prefix" ocaml-secondary-compiler:share] { opam-version >= "2.1.5" }
 ]
 depends: [
   "dune-secondary"
@@ -30,4 +32,3 @@ url {
     "sha512=37a88b3ea0bde6089e5fbf0c1f10c1867c4edcd033ed3d5b75e7ed93e14ddd4f4c4db96baf638a054f65e294b83411497615c7fc14c6ff3a2a007e70f9d12c98"
   ]
 }
-available: opam-version >= "2.1.5"
diff --git a/packages/ocaml-variants/ocaml-variants.5.1.1+flambda2/opam b/packages/ocaml-variants/ocaml-variants.5.1.1+flambda2/opam
@@ -18,12 +18,17 @@ build-env: [
   [PATH += "%{ocaml-secondary-compiler:share}%/bin"]
 ]
 build: [
-  ["autoconf"]
-  ["./configure" "--prefix=%{prefix}%" "--enable-flambda2" "--enable-runtime5=yes"]
-  [make "-j%{jobs}%"]
+  ["autoconf"] { opam-version >= "2.1.5" }
+  ["sh" "-exc" "PATH=%{ocaml-secondary-compiler:share}%/bin:$PATH autoconf"] { opam-version < "2.1.5" }
+  ["./configure" "--prefix=%{prefix}%" "--enable-flambda2" "--enable-runtime5=yes"] { opam-version >= "2.1.5" }
+  ["sh" "-exc" "PATH=%{ocaml-secondary-compiler:share}%/bin:$PATH ./configure --prefix=%{prefix}% --enable-flambda2 --enable-runtime5=yes"] { opam-version < "2.1.5" }
+  [make "-j%{jobs}%"] { opam-version >= "2.1.5" }
+  ["sh" "-exc" "PATH=%{ocaml-secondary-compiler:share}%/bin:$PATH make -j%{jobs}%"] { opam-version < "2.1.5" }
+]
+install: [
+  [make "install"] { opam-version >= "2.1.5" }
+  ["sh" "-exc" "PATH=%{ocaml-secondary-compiler:share}%/bin:$PATH make install"] { opam-version < "2.1.5" }
 ]
-install:
-  [make "install"]
 maintainer: "[email protected]"
 homepage: "https://github.com/ocaml-flambda/flambda-backend/"
 bug-reports: "https://github.com/ocaml-flambda/flambda-backend/issues"
@@ -38,4 +43,3 @@ authors: [ "The Jane Street compiler team"
   "Didier Rémy"
   "Jérôme Vouillon"
 ]
-available: opam-version >= "2.1.5"