[packages/ocaml] - split make invocation to make parallel build work - fix non optimized build

[baggins]

commit 7195882356f472c6241893d792b787c92d8f5e7d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Mar 17 08:41:11 2021 +0100

    - split make invocation to make parallel build work
    - fix non optimized build

 ocaml.spec | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/ocaml.spec b/ocaml.spec
index 67b6fea..4801c32 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -171,9 +171,14 @@ mv htmlman docs/html/ocaml
 %configure \
 	AS=%{__as} \
 	ASPP="%{__cc} -c" \
-	--libdir=%{_libdir}/ocaml
+	--libdir=%{_libdir}/ocaml \
+	%{!?with_ocaml_opt:--disable-native-compiler}
 
-%{__make} -j1 world bootstrap %{?with_ocaml_opt:opt.opt}
+%{__make} world
+%{__make} bootstrap
+%if %{with ocaml_opt}
+%{__make} opt opt.opt
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -194,7 +199,7 @@ EOF
 ln -s ../../include/caml $RPM_BUILD_ROOT%{_libdir}/ocaml/caml
 
 # compiled sources of compiler, needed by some programs
-for f in {asm,byte}comp parsing typing utils ; do
+for f in %{?with_ocaml_opt:asmcomp} bytecomp parsing typing utils ; do
 	install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/compiler/$f
 	cp $f/*.{cmi,cmo} $RPM_BUILD_ROOT%{_libdir}/%{name}/compiler/$f
 	%{?with_ocaml_opt:cp $f/*.{cmx,o} $RPM_BUILD_ROOT%{_libdir}/%{name}/compiler/$f}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocaml.git/commitdiff/7195882356f472c6241893d792b787c92d8f5e7d