From 5ebc943f989aa6a54499f540b04a87a4ea9f3b0a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Jul 2023 17:49:54 +0100 Subject: [PATCH] Add all further differences with jjames's OCaml 5 package --- ocaml.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ocaml.spec b/ocaml.spec index 55f3e50..860c653 100644 --- a/ocaml.spec +++ b/ocaml.spec @@ -114,7 +114,11 @@ Provides: bundled(md5-plumb) Provides: ocaml(compiler) = %{version} +%if %{native_compiler} %global __ocaml_requires_opts -c -f '%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte' +%else +%global __ocaml_requires_opts -c -f '%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte' -i Backend_intf -i Inlining_decision_intf -i Simplify_boxed_integer_ops_intf +%endif %global __ocaml_provides_opts -f '%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte' @@ -227,7 +231,11 @@ sed -i '/ld_opts/s|\[\]|["%{build_ldflags}"]|' tools/ocamlmklib.ml --libdir=%{_libdir}/ocaml \ --enable-flambda \ %if %{native_compiler} + --enable-native-compiler \ --enable-native-toplevel \ +%else + --disable-native-compiler \ + --disable-native-toplevel \ %endif %ifarch x86_64 %if 0%{?_include_frame_pointers} @@ -442,6 +450,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/ocaml - Convert License tag to SPDX - Ship HTML documentation instead of asciidoc source - Set ocamlmklib default flags to the Fedora linker flags +- Enable frame pointers on x86_64 * Mon Jan 23 2023 Richard W.M. Jones - 4.14.0-5 - Rebuild OCaml packages for F38