diff --git a/_service:recompress:tar_scm:ocaml-parmap-20160605.10e2437.tar.xz b/_service:recompress:tar_scm:ocaml-parmap-20160605.10e2437.tar.xz index 4abedde..ad083d1 100644 --- a/_service:recompress:tar_scm:ocaml-parmap-20160605.10e2437.tar.xz +++ b/_service:recompress:tar_scm:ocaml-parmap-20160605.10e2437.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff88f440acb3209c06c58d882ba328e526753cfd8e9609c10d4505331599594d -size 62412 +oid sha256:269c8a02b9d99297e5f9cbe196718a6f29a17f1826ab3db9d929eaedcec18456 +size 62428 diff --git a/_service:set_version:ocaml-parmap.spec b/_service:set_version:ocaml-parmap.spec index 0f95327..b4aeccc 100644 --- a/_service:set_version:ocaml-parmap.spec +++ b/_service:set_version:ocaml-parmap.spec @@ -24,15 +24,14 @@ Summary: Exploit multicore architectures for OCaml programs with minimal Url: http://rdicosmo.github.io/parmap/ Group: Development/Libraries/Other Source: %{name}-%{version}.tar.xz -BuildRequires: autoconf -BuildRequires: automake BuildRequires: ocaml -BuildRequires: ocaml-findlib -BuildRequires: ocaml-ocamlbuild +BuildRequires: ocaml-oasis BuildRequires: ocaml-ocamldoc -BuildRequires: ocaml-rpm-macros >= 4.02.1 +BuildRequires: ocaml-rpm-macros >= 4.03 BuildRequires: ocamlfind(bigarray) +BuildRequires: ocamlfind(graphics) BuildRequires: ocamlfind(unix) +BuildRequires: pkgconfig(x11) BuildRoot: %{_tmppath}/%{name}-%{version}-build # ocaml autodep start for pkg: ocaml-parmap # hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml() provides/requires @@ -64,29 +63,61 @@ developing applications that use %{name}. %setup -q %build -autoreconf -fi -I m4 -%configure -o= -make \ - LIBDIR=${o}%{_libdir}/ocaml \ - BINDIR=${o}%{_bindir} \ - MANDIR=${o}%{_mandir}/man3 \ - %{?_smp_mflags} +echo -n > config.h +if grep -w sched_setaffinity /usr/include/sched.h +then +tee -a config.h <<_EOF_ +#define HAVE_DECL_SCHED_SETAFFINITY 1 +_EOF_ +fi +rm -fv setup.ml myocamlbuild.ml META* _* */_* +# obs service changes every ^Version line ... +sh -c "sed 's/^Version.*/Version: %{version}/' | tee _oasis" <<_EOF_ +OASISFormat: 0.4 +Name: parmap +Version: 20160605.10e2437 +Synopsis: library to exploit multicore architectures (parallel programming) +Authors: Marco Danelutto and Roberto Di Cosmo +License: LGPL-2 +LicenseFile: LICENSE +Plugins: META(`oasis version`) +BuildTools: ocamlbuild + +Library parmap + Path: . + Install: true + Modules: Parmap + CSources: bytearray_stubs.c, setcore_stubs.c, config.h + CCOpt: -Wall -O2 -g -I$PWD -Werror -D_GNU_SOURCE + +Document parmap + Title: API reference for parmap + Type: ocamlbuild + BuildTools+: ocamldoc + InstallDir: \$htmldir + Install: true + XOCamlbuildPath: . + XOCamlbuildLibraries: parmap + +Executable "%{name}-mandels" + Install: true + Path: example + MainIs: mandels.ml + CompiledObject: best + BuildDepends: parmap, graphics, unix, bigarray + +_EOF_ +%oasis_setup +%ocaml_oasis_configure --enable-docs +%ocaml_oasis_build +%ocaml_oasis_doc %install -o=%{buildroot} -env \ -make \ - install \ - LIBDIR=${o}%{_libdir}/ocaml \ - BINDIR=${o}%{_bindir} \ - MANDIR=${o}%{_mandir}/man3 \ - DESTDIR=%{buildroot} \ - %{?_smp_mflags} +%ocaml_oasis_findlib_install # mkdir -vp %{buildroot}/etc/ld.so.conf.d/ tee %{buildroot}/etc/ld.so.conf.d/%{name}.conf <<_EOF_ -%{_libdir}/ocaml/stublibs +%{_libdir}/ocaml/parmap _EOF_ # @@ -98,25 +129,29 @@ _EOF_ %defattr(-,root,root) %doc README.md LICENSE /etc/ld.so.conf.d/*.conf +%{_bindir}/* %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/* +%if %{ocaml_native_compiler} +%{_libdir}/ocaml/*/*.cmxs +%endif %{_libdir}/ocaml/*/*.so -%{_libdir}/ocaml/*/*.so.owner %files devel %defattr(-,root,root,-) %doc LICENSE -%{_mandir}/*/* -%dir %{_libdir}/ocaml +%{oasis_docdir_html} %dir %{_libdir}/ocaml/* %{_libdir}/ocaml/*/*.a %if %{ocaml_native_compiler} %{_libdir}/ocaml/*/*.cmx %{_libdir}/ocaml/*/*.cmxa -%{_libdir}/ocaml/*/*.cmxs %endif +%{_libdir}/ocaml/*/*.annot %{_libdir}/ocaml/*/*.cma %{_libdir}/ocaml/*/*.cmi +%{_libdir}/ocaml/*/*.cmt +%{_libdir}/ocaml/*/*.cmti %{_libdir}/ocaml/*/*.mli %{_libdir}/ocaml/*/META diff --git a/ocaml-parmap.spec b/ocaml-parmap.spec index 51703b5..dc99273 100644 --- a/ocaml-parmap.spec +++ b/ocaml-parmap.spec @@ -24,15 +24,14 @@ Summary: Exploit multicore architectures for OCaml programs with minimal Url: http://rdicosmo.github.io/parmap/ Group: Development/Libraries/Other Source: %{name}-%{version}.tar.xz -BuildRequires: autoconf -BuildRequires: automake BuildRequires: ocaml -BuildRequires: ocaml-findlib -BuildRequires: ocaml-ocamlbuild +BuildRequires: ocaml-oasis BuildRequires: ocaml-ocamldoc -BuildRequires: ocaml-rpm-macros >= 4.02.1 +BuildRequires: ocaml-rpm-macros >= 4.03 BuildRequires: ocamlfind(bigarray) +BuildRequires: ocamlfind(graphics) BuildRequires: ocamlfind(unix) +BuildRequires: pkgconfig(x11) BuildRoot: %{_tmppath}/%{name}-%{version}-build # ocaml autodep start for pkg: ocaml-parmap # hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml() provides/requires @@ -64,29 +63,61 @@ developing applications that use %{name}. %setup -q %build -autoreconf -fi -I m4 -%configure -o= -make \ - LIBDIR=${o}%{_libdir}/ocaml \ - BINDIR=${o}%{_bindir} \ - MANDIR=${o}%{_mandir}/man3 \ - %{?_smp_mflags} +echo -n > config.h +if grep -w sched_setaffinity /usr/include/sched.h +then +tee -a config.h <<_EOF_ +#define HAVE_DECL_SCHED_SETAFFINITY 1 +_EOF_ +fi +rm -fv setup.ml myocamlbuild.ml META* _* */_* +# obs service changes every ^Version line ... +sh -c "sed 's/^Version.*/Version: %{version}/' | tee _oasis" <<_EOF_ +OASISFormat: 0.4 +Name: parmap +Version: 20160605.10e2437 +Synopsis: library to exploit multicore architectures (parallel programming) +Authors: Marco Danelutto and Roberto Di Cosmo +License: LGPL-2 +LicenseFile: LICENSE +Plugins: META(`oasis version`) +BuildTools: ocamlbuild + +Library parmap + Path: . + Install: true + Modules: Parmap + CSources: bytearray_stubs.c, setcore_stubs.c, config.h + CCOpt: -Wall -O2 -g -I$PWD -Werror -D_GNU_SOURCE + +Document parmap + Title: API reference for parmap + Type: ocamlbuild + BuildTools+: ocamldoc + InstallDir: \$htmldir + Install: true + XOCamlbuildPath: . + XOCamlbuildLibraries: parmap + +Executable "%{name}-mandels" + Install: true + Path: example + MainIs: mandels.ml + CompiledObject: best + BuildDepends: parmap, graphics, unix, bigarray + +_EOF_ +%oasis_setup +%ocaml_oasis_configure --enable-docs +%ocaml_oasis_build +%ocaml_oasis_doc %install -o=%{buildroot} -env \ -make \ - install \ - LIBDIR=${o}%{_libdir}/ocaml \ - BINDIR=${o}%{_bindir} \ - MANDIR=${o}%{_mandir}/man3 \ - DESTDIR=%{buildroot} \ - %{?_smp_mflags} +%ocaml_oasis_findlib_install # mkdir -vp %{buildroot}/etc/ld.so.conf.d/ tee %{buildroot}/etc/ld.so.conf.d/%{name}.conf <<_EOF_ -%{_libdir}/ocaml/stublibs +%{_libdir}/ocaml/parmap _EOF_ # @@ -98,25 +129,29 @@ _EOF_ %defattr(-,root,root) %doc README.md LICENSE /etc/ld.so.conf.d/*.conf +%{_bindir}/* %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/* +%if %{ocaml_native_compiler} +%{_libdir}/ocaml/*/*.cmxs +%endif %{_libdir}/ocaml/*/*.so -%{_libdir}/ocaml/*/*.so.owner %files devel %defattr(-,root,root,-) %doc LICENSE -%{_mandir}/*/* -%dir %{_libdir}/ocaml +%{oasis_docdir_html} %dir %{_libdir}/ocaml/* %{_libdir}/ocaml/*/*.a %if %{ocaml_native_compiler} %{_libdir}/ocaml/*/*.cmx %{_libdir}/ocaml/*/*.cmxa -%{_libdir}/ocaml/*/*.cmxs %endif +%{_libdir}/ocaml/*/*.annot %{_libdir}/ocaml/*/*.cma %{_libdir}/ocaml/*/*.cmi +%{_libdir}/ocaml/*/*.cmt +%{_libdir}/ocaml/*/*.cmti %{_libdir}/ocaml/*/*.mli %{_libdir}/ocaml/*/META