pool/ocaml-rpm-macros
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1061850 from home:bmwiedemann:reproducible:test

Browse Source 
Allow variables in smp_mflags to be interpolated
  for https://github.com/rpm-software-management/rpm/issues/2343

OBS-URL: https://build.opensuse.org/request/show/1061850
OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-rpm-macros?expand=0&rev=79
This commit is contained in:
Olaf Hering 2023-02-01 08:21:00 +00:00 committed by Git OBS Bridge
parent 988467c68b
commit e77390ff55
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ocaml-rpm-macros.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Jan 29 08:34:55 UTC 2023 - Bernhard Wiedemann <bwiedemann@suse.com>
- Allow variables in smp_mflags to be interpolated
for https://github.com/rpm-software-management/rpm/issues/2343
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 1 01:01:01 UTC 2023 - ohering@suse.de Sun Jan 1 01:01:01 UTC 2023 - ohering@suse.de

4
ocaml-rpm-macros.spec
View File

@ -461,7 +461,7 @@ ocaml setup.ml -configure \\\
dune installed-libraries $OCAML_DUNE_INSTALLED_LIBRARIES_ARGS ; \ dune installed-libraries $OCAML_DUNE_INSTALLED_LIBRARIES_ARGS ; \
if test -z "${_smp_mflags}" ;\ if test -z "${_smp_mflags}" ;\
then \ then \
_smp_mflags='%%{?_smp_mflags}' ;\ _smp_mflags="%%{?_smp_mflags}" ;\
case "$(ocamlc --version)" in \\\ case "$(ocamlc --version)" in \\\
4.08*) _smp_mflags='-j1' ;;\\\ 4.08*) _smp_mflags='-j1' ;;\\\
4.09*) _smp_mflags='-j1' ;;\\\ 4.09*) _smp_mflags='-j1' ;;\\\
@ -480,7 +480,7 @@ ocaml setup.ml -configure \\\
%endif %endif
if test -z "${_smp_mflags}" ;\ if test -z "${_smp_mflags}" ;\
then \ then \
_smp_mflags='%%{?_smp_mflags}' ;\ _smp_mflags="%%{?_smp_mflags}" ;\
case "$(ocamlc --version)" in \\\ case "$(ocamlc --version)" in \\\
4.08*) _smp_mflags='-j1' ;;\\\ 4.08*) _smp_mflags='-j1' ;;\\\
4.09*) _smp_mflags='-j1' ;;\\\ 4.09*) _smp_mflags='-j1' ;;\\\