Set OCAMLPARAM="_,O2=1" in the flambda2 packages

kit-ty-kate · kit-ty-kate · commit 57e9d722d662 · 2023-01-12T17:47:44.000Z
diff --git a/packages/ocaml-variants/ocaml-variants.4.14.1+flambda2/opam b/packages/ocaml-variants/ocaml-variants.4.14.1+flambda2/opam
@@ -15,7 +15,10 @@ depends: [
 ]
 conflict-class: "ocaml-core-compiler"
 flags: [ compiler avoid-version ]
-setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"
+setenv: [
+  [CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"]
+  [OCAMLPARAM = "_,O2=1"]
+]
 install: [
   ["sh" "-c" "cd \"${TMPDIR:-/tmp}\" && mv \"%{build}%\"/*.tar.gz . && tar xvf special_dune.tar.gz && tar xvf ocaml-4.14.0.tar.gz && cd ocaml-4.14.0 && ./configure \"--prefix=${TMPDIR:-/tmp}/ocaml\" && make -j%{jobs}% && make install && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" %{make}% -C \"${TMPDIR:-/tmp}/dune-special_dune\" release && cp \"${TMPDIR:-/tmp}/dune-special_dune/dune.exe\" \"%{build}%/\" && cd \"%{build}%\" && autoconf && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" ./configure \"--prefix=%{prefix}%\" --enable-middle-end=flambda2 \"--with-dune=%{build}%/dune.exe\" && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" \"%{make}%\" -j%{jobs}% && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" \"%{make}%\" install"]
 ]
diff --git a/packages/ocaml-variants/ocaml-variants.4.14.1+pr968+flambda2/opam b/packages/ocaml-variants/ocaml-variants.4.14.1+pr968+flambda2/opam
@@ -15,7 +15,10 @@ depends: [
 ]
 conflict-class: "ocaml-core-compiler"
 flags: [ compiler avoid-version ]
-setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"
+setenv: [
+  [CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"]
+  [OCAMLPARAM = "_,O2=1"]
+]
 install: [
   ["sh" "-c" "cd \"${TMPDIR:-/tmp}\" && mv \"%{build}%\"/*.tar.gz . && tar xvf special_dune.tar.gz && tar xvf ocaml-4.14.0.tar.gz && cd ocaml-4.14.0 && ./configure \"--prefix=${TMPDIR:-/tmp}/ocaml\" && make -j%{jobs}% && make install && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" %{make}% -C \"${TMPDIR:-/tmp}/dune-special_dune\" release && cp \"${TMPDIR:-/tmp}/dune-special_dune/dune.exe\" \"%{build}%/\" && cd \"%{build}%\" && autoconf && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" ./configure \"--prefix=%{prefix}%\" --enable-middle-end=flambda2 \"--with-dune=%{build}%/dune.exe\" && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" \"%{make}%\" -j%{jobs}% && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" \"%{make}%\" install"]
 ]

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,10 @@ depends: [`
`15`	`15`	`]`
`16`	`16`	`conflict-class: "ocaml-core-compiler"`
`17`	`17`	`flags: [ compiler avoid-version ]`
`18`		`-setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"`
	`18`	`+setenv: [`
	`19`	`+ [CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"]`
	`20`	`+ [OCAMLPARAM = "_,O2=1"]`
	`21`	`+]`
`19`	`22`	`install: [`
`20`	`23`	["sh" "-c" "cd \"${TMPDIR:-/tmp}\" && mv \"%{build}%\"/*.tar.gz . && tar xvf special_dune.tar.gz && tar xvf ocaml-4.14.0.tar.gz && cd ocaml-4.14.0 && ./configure \"--prefix=${TMPDIR:-/tmp}/ocaml\" && make -j%{jobs}% && make install && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" %{make}% -C \"${TMPDIR:-/tmp}/dune-special_dune\" release && cp \"${TMPDIR:-/tmp}/dune-special_dune/dune.exe\" \"%{build}%/\" && cd \"%{build}%\" && autoconf && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" ./configure \"--prefix=%{prefix}%\" --enable-middle-end=flambda2 \"--with-dune=%{build}%/dune.exe\" && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" \"%{make}%\" -j%{jobs}% && PATH=\"${TMPDIR:-/tmp}/ocaml/bin:$PATH\" \"%{make}%\" install"]
`21`	`24`	`]`