- Update to version 20191002.803edbb (1.0-rc11)

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-parmap?expand=0&rev=32
This commit is contained in:
Olaf Hering 2019-10-10 10:02:28 +00:00 committed by Git OBS Bridge
parent 22c6ff1d8b
commit 5301e1760f
5 changed files with 26 additions and 46 deletions

View File

@ -3,7 +3,7 @@
<param name="url">git://github.com/rdicosmo/parmap.git</param> <param name="url">git://github.com/rdicosmo/parmap.git</param>
<param name="scm">git</param> <param name="scm">git</param>
<param name="versionformat">%cd.%h</param> <param name="versionformat">%cd.%h</param>
<param name="revision">master</param> <param name="revision">803edbb03aedda79b0c681b4f14ea9a2f10b1514</param>
<param name="filename">ocaml-parmap</param> <param name="filename">ocaml-parmap</param>
</service> </service>
<service name="recompress" mode="disabled"> <service name="recompress" mode="disabled">

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3800bd8f4d914d2e1d3dfcc6d73530f8f506c54c40a4a9a28b4e9fc6e2a223df
size 63152

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:67c9fbefe2cfc319e0a741f072efec60404383a40866b99a3f15cd7e4df33808
size 63512

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 9 05:48:16 UTC 2019 - ohering@suse.de
- Update to version 20191002.803edbb (1.0-rc11)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 1 07:50:54 UTC 2019 - Jan Engelhardt <jengelh@inai.de> Tue Oct 1 07:50:54 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

View File

@ -17,7 +17,7 @@
Name: ocaml-parmap Name: ocaml-parmap
Version: 20190330.8d19c66 Version: 20191002.803edbb
Release: 0 Release: 0
%{?ocaml_preserve_bytecode} %{?ocaml_preserve_bytecode}
Summary: Multicore architecture exploitation for OCaml programs with minimal modifications Summary: Multicore architecture exploitation for OCaml programs with minimal modifications
@ -28,7 +28,7 @@ Source: %{name}-%{version}.tar.xz
BuildRequires: ocaml BuildRequires: ocaml
BuildRequires: ocaml-oasis BuildRequires: ocaml-oasis
BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-rpm-macros >= 4.03 BuildRequires: ocaml-rpm-macros >= 20191009
BuildRequires: ocamlfind(bigarray) BuildRequires: ocamlfind(bigarray)
BuildRequires: ocamlfind(graphics) BuildRequires: ocamlfind(graphics)
BuildRequires: ocamlfind(unix) BuildRequires: ocamlfind(unix)
@ -55,7 +55,7 @@ developing applications that use %{name}.
%prep %prep
%setup -q %autosetup -p1
%build %build
echo -n > config.h echo -n > config.h
@ -65,6 +65,15 @@ tee -a config.h <<_EOF_
#define HAVE_DECL_SCHED_SETAFFINITY 1 #define HAVE_DECL_SCHED_SETAFFINITY 1
_EOF_ _EOF_
fi fi
ocaml_version="$(ocamlc -version)"
case "${ocaml_version}" in
4.03.*|4.04.*|4.05.*)
echo 'let map_file = Bigarray.Genarray.map_file' >>parmap_compat.ml
;;
*)
echo 'let map_file = Unix.map_file' >>parmap_compat.ml
;;
esac
rm -fv setup.ml myocamlbuild.ml META* _* */_* rm -fv setup.ml myocamlbuild.ml META* _* */_*
# obs service changes every ^Version line ... # obs service changes every ^Version line ...
sh -c "sed 's/^Version.*/Version: %{version}/' | tee _oasis" <<_EOF_ sh -c "sed 's/^Version.*/Version: %{version}/' | tee _oasis" <<_EOF_
@ -81,7 +90,7 @@ BuildTools: ocamlbuild
Library parmap Library parmap
Path: . Path: .
Install: true Install: true
Modules: Parmap Modules: Parmap, Parmap_compat
CSources: bytearray_stubs.c, setcore_stubs.c, config.h CSources: bytearray_stubs.c, setcore_stubs.c, config.h
CCOpt: %{optflags} -I$PWD -Werror -D_GNU_SOURCE CCOpt: %{optflags} -I$PWD -Werror -D_GNU_SOURCE
@ -108,45 +117,11 @@ _EOF_
%install %install
%ocaml_oasis_findlib_install %ocaml_oasis_findlib_install
# %ocaml_create_file_list
mkdir -vp %{buildroot}/etc/ld.so.conf.d/
tee %{buildroot}/etc/ld.so.conf.d/%{name}.conf <<_EOF_
%{_libdir}/ocaml/parmap
_EOF_
#
%post -p /sbin/ldconfig %files -f %{name}.files
%doc README.md
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc README.md LICENSE
/etc/ld.so.conf.d/*.conf
%{_bindir}/* %{_bindir}/*
%dir %{_libdir}/ocaml
%dir %{_libdir}/ocaml/*
%if 0%{?ocaml_native_compiler}
%{_libdir}/ocaml/*/*.cmxs
%endif
%{_libdir}/ocaml/*/*.so
%files devel %files devel -f %{name}.files.devel
%defattr(-,root,root,-)
%doc LICENSE
%{oasis_docdir_html} %{oasis_docdir_html}
%dir %{_libdir}/ocaml/*
%{_libdir}/ocaml/*/*.a
%if 0%{?ocaml_native_compiler}
%{_libdir}/ocaml/*/*.cmx
%{_libdir}/ocaml/*/*.cmxa
%endif
%{_libdir}/ocaml/*/*.annot
%{_libdir}/ocaml/*/*.cma
%{_libdir}/ocaml/*/*.cmi
%{_libdir}/ocaml/*/*.cmt
%{_libdir}/ocaml/*/*.cmti
%{_libdir}/ocaml/*/*.mli
%{_libdir}/ocaml/*/META
%changelog