Compare commits

..

44 Commits
f23 ... master

Author SHA1 Message Date
Richard W.M. Jones
20d763214b OCaml 4.11.1 rebuild 2020-09-01 20:08:42 +01:00
Richard W.M. Jones
6b40285cea OCaml 4.11.0 rebuild 2020-08-21 12:03:49 +01:00
Iñaki Úcar
4dc0a227fb https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager 2020-08-14 15:24:32 +02:00
Fedora Release Engineering
b388919812 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 12:10:31 +00:00
Richard W.M. Jones
f59925e69e OCaml 4.11.0+dev2-2020-04-22 rebuild 2020-05-04 23:13:47 +01:00
Richard W.M. Jones
79843dae28 OCaml 4.11.0 pre-release attempt 2 2020-04-21 16:48:52 +01:00
Richard W.M. Jones
ff30a7d70f OCaml 4.11.0 pre-release 2020-04-17 21:22:55 +01:00
Richard W.M. Jones
8cd2fcbdbe Update all OCaml dependencies for RPM 4.16. 2020-04-02 23:08:05 +01:00
Richard W.M. Jones
18b5af6801 OCaml 4.10.0 final. 2020-02-26 14:17:09 +00:00
Fedora Release Engineering
6c6c3f20d0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-29 19:36:16 +00:00
Richard W.M. Jones
b132d34479 OCaml 4.10.0+beta1 rebuild. 2020-01-19 21:43:43 +00:00
Richard W.M. Jones
7c20dff46d OCaml 4.09.0 for riscv64 2020-01-09 15:48:12 +00:00
Richard W.M. Jones
be6272c74b OCaml 4.09.0 (final) rebuild. 2019-12-06 15:42:29 +00:00
Susi Lehtola
6db70b3ff6 Rebuilt for GSL 2.6. 2019-08-20 22:09:45 +02:00
Richard W.M. Jones
9df40a8f79 OCaml 4.08.1 (final) rebuild. 2019-08-16 17:54:15 +01:00
Richard W.M. Jones
5b2ea8cb6b OCaml 4.08.1 (rc2) rebuild. 2019-08-01 08:45:22 +01:00
Richard W.M. Jones
2fe4e2f628 Remove camlp4 dependency.
Removed upstream in v1.18.3
2019-07-29 09:45:55 +01:00
Fedora Release Engineering
36bb88c915 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 22:53:16 +00:00
Fedora Release Engineering
564b33040f - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-01 16:50:34 +00:00
Igor Gnatenko
dee3e78e23
Remove obsolete scriptlets
References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-01-27 19:39:36 +01:00
Richard W.M. Jones
6913d6d9a8 Use OpenBLAS on %{openblas_arches} (RHBZ#1619050). 2018-08-20 09:18:09 +01:00
Fedora Release Engineering
2f04d6a483 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 14:43:49 +00:00
Richard W.M. Jones
3ed7548d88 OCaml 4.07.0 (final) rebuild. 2018-07-11 19:16:12 +01:00
Richard W.M. Jones
118e842506 OCaml 4.07.0-rc1 rebuild. 2018-06-20 20:33:54 +01:00
Fedora Release Engineering
b90013215c - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-08 08:50:51 +00:00
Richard W.M. Jones
711a183b7a OCaml 4.06.0 rebuild. 2017-11-18 00:05:44 +00:00
Richard W.M. Jones
21a3e6a589 Add various build fixes for OCaml 4.05. 2017-08-08 21:17:55 +01:00
Richard W.M. Jones
6f09e92f69 Use ocaml_native_compiler macro instead of opt test. 2017-08-08 21:09:35 +01:00
Richard W.M. Jones
636701be47 OCaml 4.05.0 rebuild. 2017-08-08 20:50:22 +01:00
Fedora Release Engineering
a53d21fee6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 04:16:03 +00:00
Florian Weimer
4e98e99ad2 Rebuild with binutils fix for ppc64le (#1475636) 2017-07-31 08:28:27 +02:00
Richard W.M. Jones
5d564d04fb Rebuild for new gsl 2.4 (thanks: Arthur Mello). 2017-07-26 11:19:05 +01:00
Richard W.M. Jones
ba313f5f6b OCaml 4.04.2 rebuild. 2017-06-27 13:08:45 +01:00
Richard W.M. Jones
727e8ee3df OCaml 4.04.1 rebuild. 2017-05-13 12:46:09 +01:00
Fedora Release Engineering
d8cc2bff9a - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 00:32:02 +00:00
Dan Horák
ac9dad4dfb - rebuild for s390x codegen bug 2016-11-09 18:59:10 +01:00
Richard W.M. Jones
75c8e1bbb0 Add explicit dependency on ocamlbuild. 2016-11-07 17:28:28 +00:00
Richard W.M. Jones
86c3675f3f New upstream version 1.19.1. 2016-11-07 17:19:35 +00:00
Orion Poplawski
b914a60169 Rebuild for gsl 2.1 2016-02-22 10:04:16 -07:00
Fedora Release Engineering
e6b4f9f7d8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-04 11:07:19 +00:00
Orion Poplawski
9f0e7b2e2e Update to 1.19.0 for gsl 2 2015-11-17 16:12:11 -07:00
Richard W.M. Jones
7fafa099c8 New upstream version 1.18.4.
- Exclude armv7hl because it uses double-word alignment for doubles.
2015-07-29 10:41:54 +01:00
Richard W.M. Jones
e2aad71b41 OCaml 4.02.3 rebuild. 2015-07-28 23:23:56 +01:00
Richard W.M. Jones
a52dedb514 Remove ExcludeArch since bytecode build should now work. 2015-07-27 10:25:41 +01:00
4 changed files with 239 additions and 12 deletions

3
.gitignore vendored
View File

@ -3,3 +3,6 @@ ocamlgsl-0.6.0.tar.gz
/gsl-ocaml-1.17.2.tar.gz /gsl-ocaml-1.17.2.tar.gz
/gsl-ocaml-1.18.1.tar.gz /gsl-ocaml-1.18.1.tar.gz
/gsl-ocaml-1.18.2.tar.gz /gsl-ocaml-1.18.2.tar.gz
/gsl-ocaml-1.18.4.tar.gz
/gsl-ocaml-1.19.0.tar.gz
/gsl-ocaml-1.19.1.tar.gz

91
gsl-1.19.1-ocaml45.patch Normal file
View File

@ -0,0 +1,91 @@
diff -ur gsl-ocaml-1.19.1.old/myocamlbuild.ml gsl-ocaml-1.19.1/myocamlbuild.ml
--- gsl-ocaml-1.19.1.old/myocamlbuild.ml 2015-11-18 15:14:41.000000000 +0000
+++ gsl-ocaml-1.19.1/myocamlbuild.ml 2017-08-08 21:16:47.090002257 +0100
@@ -516,7 +516,7 @@
| nm, [], intf_modules ->
ocaml_lib nm;
let cmis =
- List.map (fun m -> (String.uncapitalize m) ^ ".cmi")
+ List.map (fun m -> (String.uncapitalize_ascii m) ^ ".cmi")
intf_modules in
dep ["ocaml"; "link"; "library"; "file:"^nm^".cma"] cmis
| nm, dir :: tl, intf_modules ->
@@ -529,7 +529,7 @@
["compile"; "infer_interface"; "doc"])
tl;
let cmis =
- List.map (fun m -> dir^"/"^(String.uncapitalize m)^".cmi")
+ List.map (fun m -> dir^"/"^(String.uncapitalize_ascii m)^".cmi")
intf_modules in
dep ["ocaml"; "link"; "library"; "file:"^dir^"/"^nm^".cma"]
cmis)
diff -ur gsl-ocaml-1.19.1.old/setup.ml gsl-ocaml-1.19.1/setup.ml
--- gsl-ocaml-1.19.1.old/setup.ml 2015-11-18 15:14:41.000000000 +0000
+++ gsl-ocaml-1.19.1/setup.ml 2017-08-08 21:16:34.884995928 +0100
@@ -315,7 +315,7 @@
let compare_csl s1 s2 =
- String.compare (String.lowercase s1) (String.lowercase s2)
+ String.compare (String.lowercase_ascii s1) (String.lowercase_ascii s2)
module HashStringCsl =
@@ -324,10 +324,10 @@
type t = string
let equal s1 s2 =
- (String.lowercase s1) = (String.lowercase s2)
+ (String.lowercase_ascii s1) = (String.lowercase_ascii s2)
let hash s =
- Hashtbl.hash (String.lowercase s)
+ Hashtbl.hash (String.lowercase_ascii s)
end)
module SetStringCsl =
@@ -365,7 +365,7 @@
else
buf
in
- String.lowercase buf
+ String.lowercase_ascii buf
end
@@ -471,7 +471,7 @@
order = Queue.create ();
name_norm =
(if case_insensitive then
- String.lowercase
+ String.lowercase_ascii
else
fun s -> s);
}
@@ -1822,13 +1822,13 @@
let capitalize_file f =
let dir = dirname f in
let base = basename f in
- concat dir (String.capitalize base)
+ concat dir (String.capitalize_ascii base)
let uncapitalize_file f =
let dir = dirname f in
let base = basename f in
- concat dir (String.uncapitalize base)
+ concat dir (String.uncapitalize_ascii base)
end
@@ -5845,8 +5845,8 @@
let make_fnames modul sufx =
List.fold_right
begin fun sufx accu ->
- (String.capitalize modul ^ sufx) ::
- (String.uncapitalize modul ^ sufx) ::
+ (String.capitalize_ascii modul ^ sufx) ::
+ (String.uncapitalize_ascii modul ^ sufx) ::
accu
end
sufx

View File

@ -1,23 +1,35 @@
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %if 0%{?fedora} >= 33
%global blaslib flexiblas
%else
%global blaslib openblas
%endif
Name: ocaml-gsl Name: ocaml-gsl
Version: 1.18.2 Version: 1.19.1
Release: 5%{?dist} Release: 34%{?dist}
Summary: Interface to GSL (GNU scientific library) for OCaml Summary: Interface to GSL (GNU scientific library) for OCaml
License: GPLv2 License: GPLv2
URL: https://mmottl.github.io/gsl-ocaml/ # "Architectures with double-word alignment for doubles are not supported"
# Specifically you should look at this file:
# %{_libdir}/ocaml/caml/config.h
# and if it has '#define ARCH_ALIGN_DOUBLE' then it is not supported,
# but if it has '#undef ARCH_ALIGN_DOUBLE' then it is OK.
ExcludeArch: armv7hl
URL: https://github.com/mmottl/gsl-ocaml
Source0: https://github.com/mmottl/gsl-ocaml/releases/download/v%{version}/gsl-ocaml-%{version}.tar.gz Source0: https://github.com/mmottl/gsl-ocaml/releases/download/v%{version}/gsl-ocaml-%{version}.tar.gz
ExcludeArch: armv7hl sparc64 s390 s390x # Various build fixes for OCaml 4.05.0.
Patch1: gsl-1.19.1-ocaml45.patch
BuildRequires: ocaml >= 3.07 BuildRequires: ocaml >= 3.07
BuildRequires: ocaml-ocamlbuild
BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-findlib-devel
BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-camlp4-devel
BuildRequires: gsl-devel >= 1.9 BuildRequires: gsl-devel >= 1.9
BuildRequires: /usr/bin/awk BuildRequires: /usr/bin/awk
BuildRequires: atlas-devel BuildRequires: %{blaslib}-devel
%description %description
@ -28,7 +40,6 @@ Objective Caml language.
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: /sbin/install-info
%description devel %description devel
@ -39,9 +50,11 @@ developing applications that use %{name}.
%prep %prep
%setup -q -n gsl-ocaml-%{version} %setup -q -n gsl-ocaml-%{version}
%patch1 -p1
%build %build
export GSL_CBLAS_LIB="-lgsl -L%{_libdir}/atlas -lsatlas" export GSL_CBLAS_LIB="-l%{blaslib}"
make make
@ -55,7 +68,7 @@ make install
%files %files
%doc COPYING.txt %doc COPYING.txt
%{_libdir}/ocaml/gsl %{_libdir}/ocaml/gsl
%if %opt %ifarch %{ocaml_native_compiler}
%exclude %{_libdir}/ocaml/gsl/*.a %exclude %{_libdir}/ocaml/gsl/*.a
%exclude %{_libdir}/ocaml/gsl/*.cmxs %exclude %{_libdir}/ocaml/gsl/*.cmxs
%exclude %{_libdir}/ocaml/gsl/*.cmxa %exclude %{_libdir}/ocaml/gsl/*.cmxa
@ -67,7 +80,7 @@ make install
%files devel %files devel
%doc COPYING.txt AUTHORS.txt CHANGES.txt README.md NOTES.md %doc COPYING.txt AUTHORS.txt CHANGES.txt README.md NOTES.md
%if %opt %ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/gsl/*.a %{_libdir}/ocaml/gsl/*.a
%{_libdir}/ocaml/gsl/*.cmxs %{_libdir}/ocaml/gsl/*.cmxs
%{_libdir}/ocaml/gsl/*.cmxa %{_libdir}/ocaml/gsl/*.cmxa
@ -76,6 +89,126 @@ make install
%changelog %changelog
* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-34
- OCaml 4.11.1 rebuild
* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-33
- OCaml 4.11.0 rebuild
* Fri Aug 14 2020 Iñaki Úcar <iucar@fedoraproject.org> - 1.19.1-32
- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-30
- OCaml 4.11.0+dev2-2020-04-22 rebuild
* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-29
- OCaml 4.11.0 pre-release attempt 2
* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-28
- OCaml 4.11.0 pre-release
* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-27
- Update all OCaml dependencies for RPM 4.16.
* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-26
- OCaml 4.10.0 final.
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-24
- OCaml 4.10.0+beta1 rebuild.
* Thu Jan 09 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-23
- OCaml 4.09.0 for riscv64
* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-22
- OCaml 4.09.0 (final) rebuild.
* Tue Aug 20 2019 Susi Lehtola <jussilehtola@fedoraproject.org> - 1.19.1-21
- Rebuilt for GSL 2.6.
* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-20
- OCaml 4.08.1 (final) rebuild.
* Thu Aug 01 2019 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-19
- OCaml 4.08.1 (rc2) rebuild.
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Aug 20 2018 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-16
- Use OpenBLAS on %%{openblas_arches} (RHBZ#1619050).
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-14
- OCaml 4.07.0 (final) rebuild.
* Wed Jun 20 2018 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-13
- OCaml 4.07.0-rc1 rebuild.
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sat Nov 18 2017 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-11
- OCaml 4.06.0 rebuild.
* Tue Aug 08 2017 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-10
- OCaml 4.05.0 rebuild.
- Use ocaml_native_compiler macro instead of opt test.
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Mon Jul 31 2017 Florian Weimer <fweimer@redhat.com> - 1.19.1-7
- Rebuild with binutils fix for ppc64le (#1475636)
* Wed Jul 26 2017 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-6
- Rebuild for new gsl 2.4 (thanks: Arthur Mello).
* Tue Jun 27 2017 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-5
- OCaml 4.04.2 rebuild.
* Sat May 13 2017 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-4
- OCaml 4.04.1 rebuild.
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Wed Nov 09 2016 Dan Horák <dan@danny.cz> - 1.19.1-2
- rebuild for s390x codegen bug
* Mon Nov 07 2016 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-1
- New upstream version 1.19.1.
- Add explicit dependency on ocamlbuild.
* Mon Feb 22 2016 Orion Poplawski <orion@cora.nwra.com> - 1.19.0-3
- Rebuild for gsl 2.1
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Nov 17 2015 Orion Poplawski <orion@cora.nwra.com> - 1.19.0-1
- Update to 1.19.0 for gsl 2
* Wed Jul 29 2015 Richard W.M. Jones <rjones@redhat.com> - 1.18.4-1
- New upstream version 1.18.4.
- Exclude armv7hl because it uses double-word alignment for doubles.
* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 1.18.2-7
- OCaml 4.02.3 rebuild.
* Mon Jul 27 2015 Richard W.M. Jones <rjones@redhat.com> - 1.18.2-6
- Remove ExcludeArch since bytecode build should now work.
* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 1.18.2-5 * Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 1.18.2-5
- ocaml-4.02.2 final rebuild. - ocaml-4.02.2 final rebuild.

View File

@ -1 +1 @@
83239c537c3b2af5f02a8d646ce358d3 gsl-ocaml-1.18.2.tar.gz b59a432ac89b49fbd0085d4e17315c50 gsl-ocaml-1.19.1.tar.gz