rpms/ocaml-dune
7
0
Fork 0
Code Issues Pull Requests Releases Activity

New version 2.4.0.

Browse Source 
Add bootstrap conditional for builds without ocaml-menhir.
This commit is contained in:
Jerry James 2020-03-06 11:01:02 -07:00
parent 114710af4f
commit 134b5e568d
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ocaml-dune.spec
View File

@ -1,8 +1,12 @@
%global libname dune %global libname dune
# Since menhir now requires dune to build, but dune needs menhir only for the
# tests, build in bootstrap mode to skip the tests and the need for menhir.
%bcond_with bootstrap
Name: ocaml-%{libname} Name: ocaml-%{libname}
Version: 2.3.1 Version: 2.4.0
Release: 2%{?dist} Release: 1%{?dist}
Summary: A composable build system for OCaml Summary: A composable build system for OCaml
# Dune itself is MIT. Some bundled libraries have a different license: # Dune itself is MIT. Some bundled libraries have a different license:
@ -24,8 +28,10 @@ BuildRequires: ocaml-findlib
BuildRequires: python3dist(sphinx) BuildRequires: python3dist(sphinx)
BuildRequires: python3dist(sphinx-rtd-theme) BuildRequires: python3dist(sphinx-rtd-theme)
%if %{without bootstrap}
# Required by tests. # Required by tests.
BuildRequires: ocaml-menhir BuildRequires: ocaml-menhir
%endif
# Dune has vendored deps (ugh): # Dune has vendored deps (ugh):
# I'm not clear on how to unbundle them. # I'm not clear on how to unbundle them.
@ -93,12 +99,10 @@ system, a mode to edit dune files, and flymake support for dune files.
./dune.exe build @install ./dune.exe build @install
%make_build doc %make_build doc
%ifarch %{ocaml_native_compiler}
# Relink the stublib. See https://github.com/ocaml/dune/issues/2977. # Relink the stublib. See https://github.com/ocaml/dune/issues/2977.
cd _build/default/src/stdune cd _build/default/src/stdune
ocamlmklib -g -ldopt "$RPM_LD_FLAGS" -o stdune_stubs fcntl_stubs.o ocamlmklib -g -ldopt "$RPM_LD_FLAGS" -o stdune_stubs fcntl_stubs.o
cd - cd -
%endif
%install %install
# "make install" only installs the binary. We want the libraries, too. # "make install" only installs the binary. We want the libraries, too.
@ -119,10 +123,12 @@ rm -fr %{buildroot}%{_prefix}/doc
mkdir -p %{buildroot}%{_pkgdocdir}/ mkdir -p %{buildroot}%{_pkgdocdir}/
cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/
%if %{without bootstrap}
%check %check
# These are the only tests we can run. The others require components that # These are the only tests we can run. The others require components that
# either depend on dune themselves or are not available in Fedora at all. # either depend on dune themselves or are not available in Fedora at all.
%{buildroot}%{_bindir}/dune runtest test/unit-tests %{buildroot}%{_bindir}/dune runtest test/unit-tests
%endif
%files %files
%license LICENSE.md %license LICENSE.md
@ -182,6 +188,10 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/
%{_emacs_sitelispdir}/dune* %{_emacs_sitelispdir}/dune*
%changelog %changelog
* Fri Mar 6 2020 Jerry James <loganjerry@gmail.com> - 2.4.0-1
- New version 2.4.0
- Add bootstrap conditional for builds without ocaml-menhir
* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 2.3.1-2 * Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 2.3.1-2
- OCaml 4.10.0 final. - OCaml 4.10.0 final.

2
sources
View File

@ -1 +1 @@
SHA512 (dune-2.3.1.tar.gz) = 2496731d8477e3d603b685616c5474ed704464cca822845c9eb623aa03d4b43caf454fc3d8b1f949360a96363450fb322e5f085305a209af7dc6b3f0f72e5ae0 SHA512 (dune-2.4.0.tar.gz) = 4e8ecc422cd00b63aca95b9ce2ab16bad6e9ab53a5be991377c932ccaf117c974012ebaaacc6138f3b5b3154d395099c6828fb87b2ba096393db2d82d3f47fee