rpms
/
ocaml-findlib
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: rpms:c9
Branches Tags
rpms:i10ce
rpms:i10cs
rpms:cs10
rpms:i8c
rpms:c8
rpms:i9c
rpms:c9
...
pull from: rpms:cs10
Branches Tags
rpms:i10ce
rpms:i10cs
rpms:cs10
rpms:i8c
rpms:c8
rpms:i9c
rpms:c9

No commits in common. 'c9' and 'cs10' have entirely different histories.
c9 ... cs10

4 changed files with 279 additions and 50 deletions
Show Stats

2
.gitignore vendored
Unescape View File

@ -1 +1 @@
SOURCES/findlib-1.8.1.tar.gz
SOURCES/findlib-1.9.6.tar.gz

2
.ocaml-findlib.metadata
Unescape View File

@ -1 +1 @@
d3fe18a261c453176e67884b0b475c3a82b68397 SOURCES/findlib-1.8.1.tar.gz
d5cf7e8c00ff9538c88d95ca18b0a1bc92242e1c SOURCES/findlib-1.9.6.tar.gz

117
SOURCES/ocaml-findlib-toolbox.patch
Unescape View File

@ -0,0 +1,117 @@
--- findlib-1.9.6/src/findlib-toolbox/Makefile.orig 2022-09-24 09:13:16.000000000 -0600
+++ findlib-1.9.6/src/findlib-toolbox/Makefile 2023-06-16 08:46:01.965686356 -0600
@@ -9,7 +9,7 @@ opt:
true
make_wizard$(EXEC_SUFFIX): make_wizard.ml
- ocamlc -o make_wizard$(EXEC_SUFFIX) -I +unix -I +labltk -I ../findlib \
+ ocamlc -o make_wizard$(EXEC_SUFFIX) -I +str -I +unix -I +labltk -I ../findlib \
unix.cma str.cma labltk.cma findlib.cma make_wizard.ml
install:
--- findlib-1.9.6/src/findlib-toolbox/make_wizard.ml.orig 2022-09-24 09:13:16.000000000 -0600
+++ findlib-1.9.6/src/findlib-toolbox/make_wizard.ml 2023-06-16 08:50:49.066603769 -0600
@@ -468,23 +468,23 @@ let makemake() =
mkquote(metaquote !wiz_package_description);
"byte_objects",
String.concat " " (List.map
- (fun m -> String.uncapitalize m ^ ".cmo")
+ (fun m -> String.uncapitalize_ascii m ^ ".cmo")
!wiz_objects);
"nat_objects",
String.concat " " (List.map
- (fun m -> String.uncapitalize m ^ ".cmx")
+ (fun m -> String.uncapitalize_ascii m ^ ".cmx")
!wiz_objects);
"byte_executables",
String.concat " " byte_execs;
"byte_exec_objects",
String.concat " " (List.map
- (fun m -> String.uncapitalize m ^ ".cmo")
+ (fun m -> String.uncapitalize_ascii m ^ ".cmo")
byte_exec_modules);
"nat_executables",
String.concat " " nat_execs;
"nat_exec_objects",
String.concat " " (List.map
- (fun m -> String.uncapitalize m ^ ".cmx")
+ (fun m -> String.uncapitalize_ascii m ^ ".cmx")
nat_exec_modules);
"prereqs",
String.concat " " required_packages;
@@ -526,7 +526,7 @@ let makemake() =
let deptargets =
String.concat " " (List.map
(fun m ->
- let m' = String.uncapitalize m in
+ let m' = String.uncapitalize_ascii m in
m' ^ ".ml " ^ m' ^ ".mli")
!modlist) in
write "makemake_exec" ( [ "switches", switches;
@@ -543,7 +543,7 @@ let makemake() =
if is_byte_exec execname then begin
let execobjs =
String.concat " " (List.map
- (fun m -> String.uncapitalize m ^ ".cmo")
+ (fun m -> String.uncapitalize_ascii m ^ ".cmo")
!modlist) in
write "byte_exec" ( ["execname", execname;
"execobjs", execobjs ] @ variables )
@@ -555,7 +555,7 @@ let makemake() =
if not (is_byte_exec execname) then begin
let execobjs =
String.concat " " (List.map
- (fun m -> String.uncapitalize m ^ ".cmx")
+ (fun m -> String.uncapitalize_ascii m ^ ".cmx")
!modlist) in
write "nat_exec" ( ["execname", execname;
"execobjs", execobjs ] @ variables )
@@ -1090,7 +1090,7 @@ let pkginfo lb row = (* when the user r
let files = Array.to_list(Sys.readdir dir) in
List.map
(fun name ->
- String.capitalize (Filename.chop_suffix name ".cmi"))
+ String.capitalize_ascii (Filename.chop_suffix name ".cmi"))
(List.filter
(fun name ->
Filename.check_suffix name ".cmi")
@@ -1128,7 +1128,7 @@ let preprocessor_scan_extensions() =
not (List.mem pkg plist)
)
!wiz_camlp4_selected in
- List.sort Pervasives.compare (plist @ plist')
+ List.sort Stdlib.compare (plist @ plist')
;;
@@ -1196,7 +1196,7 @@ add_screen preprocessor_screen;;
let prerequisites_scan_packages() =
(* Find out all packages *)
- List.sort Pervasives.compare (Fl_package_base.list_packages())
+ List.sort Stdlib.compare (Fl_package_base.list_packages())
;;
@@ -1255,10 +1255,10 @@ let buildlib_scan_modules() =
let files'' =
List.map
(fun f ->
- String.capitalize (Filename.chop_extension f)
+ String.capitalize_ascii (Filename.chop_extension f)
)
files' in
- remove_dups (List.sort Pervasives.compare files'')
+ remove_dups (List.sort Stdlib.compare files'')
;;
@@ -1353,7 +1353,7 @@ build any.";
end
else begin
wiz_executables :=
- List.sort Pervasives.compare (name :: !wiz_executables);
+ List.sort Stdlib.compare (name :: !wiz_executables);
wiz_exec_objects := (name, ref []) :: !wiz_exec_objects;
wiz_exec_native := (name, ref false) :: !wiz_exec_native;
!update_listbox();

208
SPECS/ocaml-findlib.spec
Unescape View File

@ -1,24 +1,35 @@
# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
ExcludeArch: %{ix86}
%ifnarch %{ocaml_native_compiler}
%global debug_package %{nil}
%endif
Name: ocaml-findlib
Version: 1.8.1
Release: 28%{?dist}
Version: 1.9.6
Release: 15%{?dist}
Summary: Objective CAML package manager and build helper
License: BSD
License: MIT
URL: http://projects.camlcity.org/projects/findlib.html
VCS: https://github.com/ocaml/ocamlfind
Source0: http://download.camlcity.org/download/findlib-%{version}.tar.gz
BuildRequires: make
# Fix the toolbox build with OCaml 5.x
Patch0: %{name}-toolbox.patch
BuildRequires: ocaml >= 4.02.0
BuildRequires: ocaml-labltk-devel
BuildRequires: ocaml-ocamlbuild-devel
#BuildRequires: ocaml-num-devel
BuildRequires: ocaml-ocamlbuild
BuildRequires: ocaml-compiler-libs
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-rpm-macros
BuildRequires: m4, ncurses-devel
BuildRequires: gawk
BuildRequires: make
Requires: ocaml
%global __ocaml_requires_opts -i Asttypes -i Parsetree
# Do not require ocaml-compiler-libs at runtime
%global __ocaml_requires_opts -i Asttypes -i Build_path_prefix_map -i Cmi_format -i Env -i Ident -i Identifiable -i Load_path -i Location -i Longident -i Misc -i Outcometree -i Parsetree -i Path -i Primitive -i Shape -i Subst -i Topdirs -i Toploop -i Type_immediacy -i Types -i Warnings
%description
@ -27,7 +38,7 @@ Objective CAML package manager and build helper.
%package devel
Summary: Development files for %{name}
Requires: %{name} = %{version}-%{release}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
@ -36,7 +47,24 @@ developing applications that use %{name}.
%prep
%setup -q -n findlib-%{version}
%autosetup -p1 -n findlib-%{version}
# Fix character encoding
iconv -f ISO8859-1 -t UTF-8 doc/README > doc/README.utf8
touch -r doc/README doc/README.utf8
mv doc/README.utf8 doc/README
# Fix the OCaml core man directory
sed -i 's,/usr/local/man,%{_mandir},' configure
# Configure bug? dynlink_subdir is the empty string
sed -i 's/\${dynlink_subdir}/dynlink/' configure
# Build an executable that is not damaged by stripping
sed -i 's/\(custom=\)-custom/\1-output-complete-exe/' configure
# Skip broken test for ocamlopt -g
sed -i '/^ocamlopt -g/d' configure
%build
@ -50,9 +78,9 @@ cat src/findlib/ocaml_args.ml
-sitelib `ocamlc -where` \
-mandir %{_mandir} \
-with-toolbox
make all
%make_build all
%ifarch %{ocaml_native_compiler}
make opt
%make_build opt
%endif
rm doc/guide-html/TIMESTAMP
@ -66,56 +94,140 @@ make install \
OCAMLFIND_BIN=%{_bindir} \
OCAMLFIND_MAN=%{_mandir}
# Remove spurious executable bits
chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man{1,5}/*
chmod 0644 $RPM_BUILD_ROOT%{_libdir}/ocaml/findlib/*.{cma,cmi,ml,mli,pattern}
chmod 0644 $RPM_BUILD_ROOT%{_libdir}/ocaml/findlib/{META,Makefile*}
%ifarch %{ocaml_native_compiler}
chmod 0644 $RPM_BUILD_ROOT%{_libdir}/ocaml/findlib/*.{a,cmxa}
%endif
%ocaml_files
sed -i '/ocamlfind\.conf/d' .ofiles
%files
%files -f .ofiles
%doc LICENSE doc/README
%config(noreplace) %{_sysconfdir}/ocamlfind.conf
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man5/*
%{_libdir}/ocaml/*/META
%{_libdir}/ocaml/topfind
%{_libdir}/ocaml/findlib
%ifarch %{ocaml_native_compiler}
%exclude %{_libdir}/ocaml/findlib/*.a
%exclude %{_libdir}/ocaml/findlib/*.cmxa
%endif
%exclude %{_libdir}/ocaml/findlib/*.mli
%exclude %{_libdir}/ocaml/findlib/Makefile.config
%exclude %{_libdir}/ocaml/findlib/make_wizard
%exclude %{_libdir}/ocaml/findlib/make_wizard.pattern
# Had to disable this in OCaml 4.06, unclear why.
#%%{_libdir}/ocaml/num-top
%files devel
%files devel -f .ofiles-devel
%doc LICENSE doc/README doc/guide-html
%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/findlib/*.a
%{_libdir}/ocaml/findlib/*.cmxa
%endif
%{_libdir}/ocaml/findlib/*.mli
%{_libdir}/ocaml/findlib/Makefile.config
%changelog
* Fri Mar 11 2022 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-28
- Rebuild for EPEL
resolves: rhbz#2060850
* Wed Oct 30 2024 Troy Dawson <tdawson@redhat.com> - 1.9.6-15
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Tue Jun 25 2024 Troy Dawson <tdawson@redhat.com> - 1.9.6-14
- Bump release for June 2024 mass rebuild
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.8.1-27
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 1.9.6-13
- OCaml 5.2.0 ppc64le fix
* Sat Aug 7 2021 Florian Weimer <fweimer@redhat.com> - 1.8.1-26
- Rebuild to pick up new build flags from redhat-rpm-config (#1984652)
* Wed May 29 2024 Richard W.M. Jones <rjones@redhat.com> - 1.9.6-12
- OCaml 5.2.0 for Fedora 41
* Wed Jun 23 2021 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-25
* Mon Jan 29 2024 Richard W.M. Jones <rjones@redhat.com> - 1.9.6-11
- Bump and rebuild
resolves: rhbz#1975308
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.8.1-24
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.6-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 1.9.6-8
- OCaml 5.1.1 + s390x code gen fix for Fedora 40
* Tue Dec 12 2023 Richard W.M. Jones <rjones@redhat.com> - 1.9.6-7
- OCaml 5.1.1 rebuild for Fedora 40
* Thu Oct 05 2023 Richard W.M. Jones <rjones@redhat.com> - 1.9.6-6
- OCaml 5.1 rebuild for Fedora 40
* Wed Oct 4 2023 Jerry James <loganjerry@gmail.com> - 1.9.6-5
- Build an executable that is not damaged by stripping
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jul 11 2023 Richard W.M. Jones <rjones@redhat.com> - 1.9.6-4
- OCaml 5.0 rebuild for Fedora 39
* Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 1.9.6-3
- OCaml 5.0.0 rebuild
- Verify the License is valid SPDX
- Fix natdynlink detection
- Add patch to fix toolbox build for OCaml 5.x
- Convert README to UTF-8
- Use new OCaml macros
* Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 1.9.6-2
- Rebuild OCaml packages for F38
* Mon Jan 23 2023 Richard W.M. Jones <rjones@redhat.com> - 1.9.6-1
- New upstream version 1.9.6
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sun Jun 19 2022 Richard W.M. Jones <rjones@redhat.com> - 1.9.5-1
- New upstream version 1.9.5
* Sat Jun 18 2022 Richard W.M. Jones <rjones@redhat.com> - 1.9.4-2
- OCaml 4.14.0 rebuild
* Wed Jun 08 2022 Richard W.M. Jones <rjones@redhat.com> - 1.9.4-1
- Update to findlib 1.9.4
* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 1.9.3-2
- OCaml 4.13.1 rebuild to remove package notes
* Wed Jan 26 2022 Richard W.M. Jones <rjones@redhat.com> - 1.9.3-1
- Update to findlib 1.9.3
* Sat Jan 22 2022 Richard W.M. Jones <rjones@redhat.com> - 1.9.2-1
- Update to findlib 1.9.2
- Remove patch which has been applied upstream.
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jan 7 2022 Jerry James <loganjerry@gmail.com> - 1.9.1-4
- Fix labltk detection
- Change license from BSD to MIT
* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 1.9.1-3
- Bump and rebuild for updated ocaml-labltk
* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 1.9.1-2
- OCaml 4.13.1 build
* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 1.9.1-1
- New upstream development version 1.9.1
* Tue Jul 27 2021 Richard W.M. Jones <rjones@redhat.com> - 1.9-3
- Rebuild for changed ocamlx(Dynlink)
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon Mar 15 2021 Richard W.M. Jones <rjones@redhat.com> - 1.9-1
- New upstream version 1.9.
* Mon Mar 15 2021 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-26
- Bump and rebuild for ELN broken deps.
* Mon Mar 1 2021 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-25
- Rebuild for updated ocaml-labltk
* Mon Mar 1 09:37:08 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-24
- OCaml 4.12.0 build
* Mon Feb 1 2021 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-23
- Bump and rebuild for updated ocaml Dynlink dependency.

Write Preview
Loading…
Cancel
Save