Compare commits

..

No commits in common. "bd3027f003330fbf01ef123cbb71cc8bd573c370" and "fcc1625e294cd14b573ed90857eed668103c7adb" have entirely different histories.

5 changed files with 21 additions and 60 deletions

View File

@ -1,10 +1,3 @@
# ocaml-base
[Base](https://opensource.janestreet.com/base/) is a complete and portable
alternative to the OCaml standard library. It provides all standard
functionalities one would expect from a language standard library. It uses
consistent conventions across all of its modules.
Base aims to be usable in any context. As a result system dependent features
such as I/O are not offered by Base. They are instead provided by companion
libraries such as [stdio](https://github.com/janestreet/stdio).
The ocaml-base package

View File

@ -1,26 +0,0 @@
--- a/shadow-stdlib/gen/mapper.mll 2021-11-19 11:05:01.000000000 -0700
+++ b/shadow-stdlib/gen/mapper.mll 2021-11-23 15:17:54.018455142 -0700
@@ -110,10 +110,13 @@ let val_replacement = function
| "abs" -> No_equivalent
| "abs_float" -> No_equivalent
| "acos" -> Repl "Float.acos"
+ | "acosh" -> Repl "Float.acosh"
| "asin" -> Repl "Float.asin"
+ | "asinh" -> Repl "Float.asinh"
| "at_exit" -> No_equivalent
| "atan" -> Repl "Float.atan"
| "atan2" -> Repl "Float.atan2"
+ | "atanh" -> Repl "Float.atanh"
| "bool_of_string" -> Repl "Bool.of_string"
| "bool_of_string_opt" -> No_equivalent
| "ceil" -> Repl "Float.round_up"
--- a/src/dune 2021-11-19 11:05:01.000000000 -0700
+++ b/src/dune 2021-11-23 15:29:54.579266675 -0700
@@ -9,6 +9,7 @@
(library (name base) (public_name base)
(libraries base_internalhash_types caml sexplib0 shadow_stdlib)
+ (flags :standard -w -55)
(c_flags :standard -D_LARGEFILE64_SOURCE (:include mpopcnt.sexp))
(c_names exn_stubs int_math_stubs hash_stubs am_testing)
(preprocess no_preprocessing)

11
ocaml-base.rpmlintrc Normal file
View File

@ -0,0 +1,11 @@
# THIS FILE IS FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON
# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors
# The dictionary is missing some technical terms
addFilter(r'W: spelling-error .* performant')
# Documentation is in the main package
addFilter(r'ocaml-base-devel\.[^:]+: W: no-documentation')
# The stub library does not need any C library symbols
addFilter(r'E: shared-lib-without-dependency-information .*stubs\.so')

View File

@ -1,4 +1,3 @@
%undefine _package_note_flags
# TESTING NOTE: The ppx_jane module is needed to run the tests. However,
# ppx_jane transitively requires this module. Therefore, we cannot run the
# tests at all until we are able to add ppx_jane to Fedora, and even then we
@ -7,20 +6,17 @@
%global srcname base
Name: ocaml-%{srcname}
Version: 0.15.0
Release: 4%{?dist}
Version: 0.14.1
Release: 3%{?dist}
Summary: Jane Street standard library for OCaml
License: MIT
URL: https://opensource.janestreet.com/base/
Source0: https://github.com/janestreet/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz
# Adapt to changes in the OCaml 4.13 standard library
# See https://github.com/janestreet/base/issues/125
Patch0: %{name}-ocaml413.patch
BuildRequires: ocaml >= 4.10.0
BuildRequires: ocaml >= 4.07.0
BuildRequires: ocaml-dune-devel >= 2.0.0
BuildRequires: ocaml-sexplib0-devel >= 0.15
BuildRequires: ocaml-sexplib0-devel >= 0.14
%description
Base is a standard library for OCaml. It provides a standard set of
@ -45,7 +41,10 @@ developing applications that use %{name}.
%autosetup -n %{srcname}-%{version} -p1
%build
dune build %{?_smp_mflags} --verbose --release
dune build %{?_smp_mflags}
# TODO: Once odoc is available, BR it and run this to generate documentation:
# dune build %{?_smp_mflags} @doc
# Dune passes %%build_ldflags to ocamlmklib without -ldopt, resulting in
# "Unknown option" warnings from ocamlmklib and a library that has not been
@ -110,22 +109,6 @@ rm -fr %{buildroot}%{_prefix}/doc
%{_libdir}/ocaml/%{srcname}/*/*.mli
%changelog
* Thu Feb 24 2022 Jerry James <loganjerry@gmail.com> - 0.15.0-4
- Version 0.15.0 rerelease
* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 0.15.0-3
- OCaml 4.13.1 rebuild to remove package notes
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Nov 30 2021 Jerry James <loganjerry@gmail.com> - 0.15.0-1
- Version 0.15.0
- Add patch for OCaml 4.13 compatibility
* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 0.14.1-4
- OCaml 4.13.1 build
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (base-0.15.0.tar.gz) = 1e9a507f66a44b53eb80c866a544263ae5811992866043cb626826de8a4b4c6086601554fbe93ec874773edd229fab052be9cdfa5b75ef3bc7eaff468b53bca6
SHA512 (base-0.14.1.tar.gz) = 5675a8b6b1ee5b7bd992ac9fbb036239f11b8a8c7cac9059ca38581d91f42e35d7bfa5839a90ed227344dd4c7b1bbacf0e7871d958c81f6ccf7e072b64ceff2e