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

- remove unused ocaml_dune_bootstrap_directory

Browse Source 
- move all invocations of dune from ocaml_dune_setup to ocaml_dune_build
- process content of ocaml_standard_library only if it exists in buildroot

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-rpm-macros?expand=0&rev=72
This commit is contained in:
Olaf Hering 2022-04-09 19:43:24 +00:00 committed by Git OBS Bridge
parent dbbe35cf71
commit 7b158bafe9
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ocaml-rpm-macros.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Apr 9 12:34:56 UTC 2022 - ohering@suse.de
- remove unused ocaml_dune_bootstrap_directory
- move all invocations of dune from ocaml_dune_setup to ocaml_dune_build
- process content of ocaml_standard_library only if it exists in buildroot
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 22 22:22:22 UTC 2022 - ohering@suse.de Tue Feb 22 22:22:22 UTC 2022 - ohering@suse.de

13
ocaml-rpm-macros.spec
View File

@ -17,7 +17,7 @@
Name: ocaml-rpm-macros Name: ocaml-rpm-macros
Version: 20220222 Version: 20220409
Release: 0 Release: 0
Summary: RPM macros for building OCaml source packages Summary: RPM macros for building OCaml source packages
License: GPL-2.0-only License: GPL-2.0-only
@ -173,8 +173,10 @@ tee %buildroot%_rpmmacrodir/macros.%name <<'_EOF_'
%endif %endif
test -f "${license}" && echo "%%%%${license_macro} ${license}" >> '%%name.files.license' ;\ test -f "${license}" && echo "%%%%${license_macro} ${license}" >> '%%name.files.license' ;\
done ;\ done ;\
find %%buildroot%%ocaml_standard_library -name '*.cmxs' -exec chmod -v a-x '{}' + ;\ if test -d %%buildroot%%ocaml_standard_library ;\
find %%buildroot%%ocaml_standard_library ! -type d | awk\\\ then\
find %%buildroot%%ocaml_standard_library -name '*.cmxs' -exec chmod -v a-x '{}' + ;\
find %%buildroot%%ocaml_standard_library ! -type d | awk\\\
-v "buildroot=%%buildroot"\\\ -v "buildroot=%%buildroot"\\\
-v "ocaml_standard_library=%%ocaml_standard_library"\\\ -v "ocaml_standard_library=%%ocaml_standard_library"\\\
-v "out_files_main=%%name.files"\\\ -v "out_files_main=%%name.files"\\\
@ -341,6 +343,7 @@ tee %buildroot%_rpmmacrodir/macros.%name <<'_EOF_'
END {\ END {\
;\ ;\
}' ;\ }' ;\
fi ;\
cat '%%name.files.changes' >> '%%name.files' ;\ cat '%%name.files.changes' >> '%%name.files' ;\
cat '%%name.files.license' >> '%%name.files' ;\ cat '%%name.files.license' >> '%%name.files' ;\
if test -s %%name.files.ldsoconf ;\ if test -s %%name.files.ldsoconf ;\
@ -424,7 +427,6 @@ ocaml setup.ml -configure \\\
%%ocaml_oasis_test \ %%ocaml_oasis_test \
ocaml setup.ml -test ocaml setup.ml -test
# #
%%ocaml_dune_bootstrap_directory %%_libexecdir/dune-bootstrap
%%ocaml_dune_setup \ %%ocaml_dune_setup \
%ifarch ppc64 ppc64le %ifarch ppc64 ppc64le
ulimit -s $((1024 * 64)) ; \ ulimit -s $((1024 * 64)) ; \
@ -460,9 +462,10 @@ ocaml setup.ml -configure \\\
echo "${dune_release_pkgs}" > dune_release_pkgs-%%name-%%version-%%release ; \ echo "${dune_release_pkgs}" > dune_release_pkgs-%%name-%%version-%%release ; \
dune_for_release="--for-release-of-packages=${dune_release_pkgs}" ; \ dune_for_release="--for-release-of-packages=${dune_release_pkgs}" ; \
fi ; \ fi ; \
dune installed-libraries $OCAML_DUNE_INSTALLED_LIBRARIES_ARGS ; \
%%nil %%nil
%%ocaml_dune_build \ %%ocaml_dune_build \
dune --version ; \
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}' ;\