pool/ocaml-findlib
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 258139 from devel:languages:ocaml

Browse Source 
-  Update to upstream version 1.5.5
   New ppxopt META variables.
   Support for OCAMLFIND_TOOLCHAIN environment variable.

- BuildRequire ocaml-rpm-macros

- BuildRequire at least ocaml 4.02

-  Update to upstream version 1.5.3
   The installation of "bytes" respects now $prefix and the
   configured destination.
   New option -pp for "ocamlfind query", to get preprocessor
   packages.  Updated the compatibility Bytes module to support
   extend, init, mapi,  blit_string.
-  1.5.2: support for the query formats "%+a" and "%+A".
   Fix: the "ppx" property is now also path-expanded when
   interpreted in a toploop.
   Fix: implicit "ppx" is not path-expanded anymore.
   Fix: Build bytes.cmxs only if natdynlink is enabled.
-  1.5.1: includes a file that was missing in 1.5
-  1.5: Including the "bytes" package that is either a compat
   package for ocaml < 4.02 or a fake package for ocaml >= 4.02.
   The package aims at helping to support the transition to the new
   "bytes" type for mutable strings.
   Also installing findlib.cmxs if OCaml supports it.
   Allowing to disable camlp4 (in prep for OCaml-4.02).
   The "ppx" package property can be specified for constructing
   ppx-type preprocessor.
-  1.4.1:ocamldoc: The order of -ppopt arguments was changed by
   ocamlfind, which is not correct.
-  1.4: Fixed performance bug when many arguments need to be processed.
   Auto-configuring ocamldoc.opt if it is found.
   New config switch -no-custom to prevent that "ocamlfind" is
   linked in custom-runtime mode (bytecode only).
   The library dbm is no longer part of OCaml, and now optional in
   findlib 
   Support for ocamloptp.
   New function Topfind.log for controlling the verbosity.
   Rewritten Fl_metascanner without camlp4

OBS-URL: https://build.opensuse.org/request/show/258139
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocaml-findlib?expand=0&rev=4
This commit is contained in:
Stephan Kulow 2014-10-31 17:27:30 +00:00 committed by Git OBS Bridge
commit 80bdbb0d52
5 changed files with 90 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
findlib-1.3.3.patch
View File

@ -4,28 +4,29 @@
src/findlib/Makefile | 22 +++++++++++-----------
3 files changed, 28 insertions(+), 28 deletions(-)
Index: findlib-1.3.3/Makefile
Index: findlib-1.5.5/Makefile
===================================================================
--- findlib-1.3.3.orig/Makefile
+++ findlib-1.3.3/Makefile
@@ -17,13 +17,13 @@ opt:
for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ); done
--- findlib-1.5.5.orig/Makefile
+++ findlib-1.5.5/Makefile
@@ -17,14 +17,14 @@ opt:
for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done
install:
- mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
- mkdir -p "$(prefix)$(OCAMLFIND_MAN)"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)"
$(MAKE) install-config
for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done
$(MAKE) install-meta
cd src/findlib; $(MAKE) install-num-top
$(MAKE) install-config
- cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"
+ cp tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
if [ $(INSTALL_CAMLP4) -eq 1 ]; then \
- cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"; \
+ cp tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"; \
fi
$(MAKE) install-doc
uninstall:
@@ -66,32 +66,32 @@ findlib.conf: findlib.conf.in
@@ -71,32 +71,32 @@ findlib.conf: findlib.conf.in
.PHONY: install-doc
install-doc:
@ -71,10 +72,10 @@ Index: findlib-1.3.3/Makefile
.PHONY: uninstall-config
uninstall-config:
Index: findlib-1.3.3/src/findlib-toolbox/Makefile
Index: findlib-1.5.5/src/findlib-toolbox/Makefile
===================================================================
--- findlib-1.3.3.orig/src/findlib-toolbox/Makefile
+++ findlib-1.3.3/src/findlib-toolbox/Makefile
--- findlib-1.5.5.orig/src/findlib-toolbox/Makefile
+++ findlib-1.5.5/src/findlib-toolbox/Makefile
@@ -13,7 +13,7 @@ make_wizard$(EXEC_SUFFIX): make_wizard.m
findlib.cma make_wizard.ml
@ -84,11 +85,11 @@ Index: findlib-1.3.3/src/findlib-toolbox/Makefile
# uninstall: Nothing to do, because the removal of the findlib core also
# deinstalls the make_wizard
Index: findlib-1.3.3/src/findlib/Makefile
Index: findlib-1.5.5/src/findlib/Makefile
===================================================================
--- findlib-1.3.3.orig/src/findlib/Makefile
+++ findlib-1.3.3/src/findlib/Makefile
@@ -80,30 +80,30 @@ clean:
--- findlib-1.5.5.orig/src/findlib/Makefile
+++ findlib-1.5.5/src/findlib/Makefile
@@ -97,30 +97,30 @@ clean:
ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
install: all
@ -98,7 +99,7 @@ Index: findlib-1.3.3/src/findlib/Makefile
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
+ test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)"
files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a META` && \
files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs META` && \
- cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
+ cp $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \

3
findlib-1.3.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:181e0855a2eaae0b16fb48ba8ee4a80fe3a6d24f9b586ba58072007fab4a0b99
size 139860

3
findlib-1.5.5.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:19b17d1c09e51f891974b462ed81f1ff78ea53ade78646fad90c46b69dc55c5a
size 150476

52
ocaml-findlib.changes
View File

@ -1,3 +1,55 @@
-------------------------------------------------------------------
Thu Oct 23 17:01:25 UTC 2014 - ohering@suse.de
- Update to upstream version 1.5.5
New ppxopt META variables.
Support for OCAMLFIND_TOOLCHAIN environment variable.
-------------------------------------------------------------------
Thu Oct 23 12:40:36 UTC 2014 - ohering@suse.de
- BuildRequire ocaml-rpm-macros
-------------------------------------------------------------------
Fri Oct 10 17:07:25 UTC 2014 - ohering@suse.de
- BuildRequire at least ocaml 4.02
-------------------------------------------------------------------
Wed Oct 8 14:18:37 CEST 2014 - ohering@suse.de
- Update to upstream version 1.5.3
The installation of "bytes" respects now $prefix and the
configured destination.
New option -pp for "ocamlfind query", to get preprocessor
packages. Updated the compatibility Bytes module to support
extend, init, mapi, blit_string.
- 1.5.2: support for the query formats "%+a" and "%+A".
Fix: the "ppx" property is now also path-expanded when
interpreted in a toploop.
Fix: implicit "ppx" is not path-expanded anymore.
Fix: Build bytes.cmxs only if natdynlink is enabled.
- 1.5.1: includes a file that was missing in 1.5
- 1.5: Including the "bytes" package that is either a compat
package for ocaml < 4.02 or a fake package for ocaml >= 4.02.
The package aims at helping to support the transition to the new
"bytes" type for mutable strings.
Also installing findlib.cmxs if OCaml supports it.
Allowing to disable camlp4 (in prep for OCaml-4.02).
The "ppx" package property can be specified for constructing
ppx-type preprocessor.
- 1.4.1:ocamldoc: The order of -ppopt arguments was changed by
ocamlfind, which is not correct.
- 1.4: Fixed performance bug when many arguments need to be processed.
Auto-configuring ocamldoc.opt if it is found.
New config switch -no-custom to prevent that "ocamlfind" is
linked in custom-runtime mode (bytecode only).
The library dbm is no longer part of OCaml, and now optional in
findlib
Support for ocamloptp.
New function Topfind.log for controlling the verbosity.
Rewritten Fl_metascanner without camlp4
-------------------------------------------------------------------
Mon Jun 3 09:23:34 CEST 2013 - ohering@suse.de

43
ocaml-findlib.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ocaml-findlib
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010-2011 Andrew Psaltis <ampsaltis at gmail dot com>
#
# All modifications and additions to the file contributed by third parties
@ -17,17 +17,10 @@
#
%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%if !%opt
# get rid of /usr/lib/rpm/find-debuginfo.sh
# strip kills the bytecode part of ELF binaries
# see also NO_BRP_STRIP_DEBUG in install section
%undefine _build_create_debug
%endif
Name: ocaml-findlib
Version: 1.3.3
Version: 1.5.5
Release: 0
%{ocaml_preserve_bytecode}
Name: ocaml-findlib
Summary: Objective CAML package manager and build helper
License: MIT
Group: Development/Libraries/Other
@ -42,9 +35,10 @@ Provides: ocamlfind = %{version}
BuildRequires: gawk
BuildRequires: m4
BuildRequires: ncurses-devel
BuildRequires: ocaml
BuildRequires: ocaml-camlp4-devel
BuildRequires: ocaml >= 4.02.0
BuildRequires: ocaml-camlp4-devel >= 4.02.0
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-rpm-macros >= 4.02.1
%description
Findlib is a library manager for Objective Caml. It provides a
@ -78,17 +72,12 @@ tools/extract_args/extract_args -o src/findlib/ocaml_args.ml ocamlc ocamlcp ocam
-mandir %{_mandir} \
-with-toolbox
make all
%if %opt
%if %{ocaml_native_compiler}
make opt
%endif
rm doc/guide-html/TIMESTAMP
%install
%if !%opt
# get rid of /usr/lib/rpm/brp-strip-debug
# strip kills the bytecode part of ELF binaries
export NO_BRP_STRIP_DEBUG=true
%endif
make install DESTDIR=$RPM_BUILD_ROOT
%files
@ -98,20 +87,19 @@ make install DESTDIR=$RPM_BUILD_ROOT
%{_bindir}/*
%{_mandir}/man?/*
%{_libdir}/ocaml/bigarray
%{_libdir}/ocaml/dbm
%{_libdir}/ocaml/camlp4
%{_libdir}/ocaml/compiler-libs
%{_libdir}/ocaml/dynlink
%{_libdir}/ocaml/findlib
%{_libdir}/ocaml/graphics
%{_libdir}/ocaml/num
%{_libdir}/ocaml/ocamlbuild
%{_libdir}/ocaml/stdlib
%{_libdir}/ocaml/str
%{_libdir}/ocaml/unix
%{_libdir}/ocaml/camlp4
%{_libdir}/ocaml/ocamlbuild
%{_libdir}/ocaml/threads
%{_libdir}/ocaml/topfind
%{_libdir}/ocaml/findlib
%{_libdir}/ocaml/compiler-libs
%if %opt
%{_libdir}/ocaml/unix
%if %{ocaml_native_compiler}
%exclude %{_libdir}/ocaml/findlib/*.a
%exclude %{_libdir}/ocaml/findlib/*.cmxa
%endif
@ -122,11 +110,12 @@ make install DESTDIR=$RPM_BUILD_ROOT
%files devel
%defattr(-,root,root,-)
%doc LICENSE doc/README doc/guide-html
%if %opt
%if %{ocaml_native_compiler}
%{_libdir}/ocaml/findlib/*.a
%{_libdir}/ocaml/findlib/*.cmxa
%endif
%{_libdir}/ocaml/findlib/*.mli
%{_libdir}/ocaml/findlib/Makefile.config
%{_libdir}/ocaml/bytes
%changelog