Hello community,
here is the log from the commit of package ocaml-rpm-macros for
openSUSE:Factory checked in at 2020-03-24 22:31:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-rpm-macros"
Tue Mar 24 22:31:33 2020 rev:6 rq:787222 version:20200321
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2020-02-26 15:01:44.784796126 +0100
+++
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.3160/ocaml-rpm-macros.changes
2020-03-24 22:31:42.721070293 +0100
@@ -1,0 +2,6 @@
+Sat Mar 21 12:34:56 UTC 2020 - [email protected]
+
+- Disable parallel build for OCaml 4.08, 4.09 and 4.10
+ to get reproducible cma archives (issue#9307)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml-rpm-macros.spec ++++++
--- /var/tmp/diff_new_pack.hrpZgq/_old 2020-03-24 22:31:44.557071215 +0100
+++ /var/tmp/diff_new_pack.hrpZgq/_new 2020-03-24 22:31:44.565071220 +0100
@@ -16,7 +16,7 @@
#
Name: ocaml-rpm-macros
-Version: 20200220
+Version: 20200321
Release: 0
Summary: RPM macros for building OCaml source packages
License: GPL-2.0-only
@@ -413,16 +413,34 @@
| awk '/^-[[:blank:]]/{ printf "BuildRequires:
ocamlfind(%%s)\\n", $2}' | sort -u ; \
%%{nil}
%%ocaml_dune_build \
+ if test -z "${_smp_mflags}" ;\
+ then \
+ _smp_mflags='%%{?_smp_mflags}' ;\
+ case "$(ocamlc --version)" in \\\
+ 4.08*) _smp_mflags='-j1' ;;\\\
+ 4.09*) _smp_mflags='-j1' ;;\\\
+ 4.10*) _smp_mflags='-j1' ;;\\\
+ esac ;\
+ fi ;\
dune build \\\
--verbose \\\
${dune_for_release} \\\
- %%{?_smp_mflags} \\\
+ ${_smp_mflags} \\\
'@install' \\\
$OCAML_DUNE_BUILD_INSTALL_ARGS
%%ocaml_dune_install \
%ifarch ppc64 ppc64le
ulimit -s $((1024 * 64)) ; \
%endif
+ if test -z "${_smp_mflags}" ;\
+ then \
+ _smp_mflags='%%{?_smp_mflags}' ;\
+ case "$(ocamlc --version)" in \\\
+ 4.08*) _smp_mflags='-j1' ;;\\\
+ 4.09*) _smp_mflags='-j1' ;;\\\
+ 4.10*) _smp_mflags='-j1' ;;\\\
+ esac ;\
+ fi ;\
dune_for_release= ;\
if test -f dune_release_pkgs-%%{name}-%%{version}-%%{release} ; \
then \
@@ -432,7 +450,7 @@
dune install \\\
--verbose \\\
${dune_for_release} \\\
- %%{?_smp_mflags} \\\
+ ${_smp_mflags} \\\
--prefix=%%{_prefix} \\\
--libdir=%%{ocaml_standard_library} \\\
--destdir=%%{buildroot} \\\
