pool/ocaml-findlib
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1bd9206b47
ocaml-findlib/findlib-1.3.3.patch
Olaf Hering 66890916c6 - 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.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=26
2014-10-08 12:23:03 +00:00

134 lines
6.4 KiB
Diff
Raw Blame History

---
Makefile | 32 ++++++++++++++++----------------
src/findlib-toolbox/Makefile | 2 +-
src/findlib/Makefile | 22 +++++++++++-----------
3 files changed, 28 insertions(+), 28 deletions(-)
Index: findlib-1.5.3/Makefile
===================================================================
--- findlib-1.5.3.orig/Makefile
+++ findlib-1.5.3/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
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
@@ -71,32 +71,32 @@ findlib.conf: findlib.conf.in
.PHONY: install-doc
install-doc:
- mkdir -p $(prefix)$(OCAMLFIND_MAN)/man1 $(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5
- -cp doc/ref-man/ocamlfind.1 $(prefix)$(OCAMLFIND_MAN)/man1
- -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 $(prefix)$(OCAMLFIND_MAN)/man5
+ mkdir -p $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5
+ -cp doc/ref-man/ocamlfind.1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1
+ -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5
.PHONY: uninstall-doc
uninstall-doc:
- rm -f $(prefix)$(OCAMLFIND_MAN)/man1/ocamlfind.1
- rm -f $(prefix)$(OCAMLFIND_MAN)/man3/Findlib.3
- rm -f $(prefix)$(OCAMLFIND_MAN)/man3/Topfind.3
- rm -f $(prefix)$(OCAMLFIND_MAN)/man5/META.5
- rm -f $(prefix)$(OCAMLFIND_MAN)/man5/site-lib.5
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1/ocamlfind.1
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3/Findlib.3
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3/Topfind.3
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5/META.5
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5/site-lib.5
.PHONY: install-meta
install-meta:
- for x in `ls site-lib-src`; do if [ "$$x" != "CVS" -a -f "site-lib-src/$$x/META" ]; then mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
+ for x in `ls site-lib-src`; do if [ "$$x" != "CVS" -a -f "site-lib-src/$$x/META" ]; then mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
.PHONY: uninstall-meta
uninstall-meta:
- for x in `ls site-lib-src`; do if [ "$$x" != "CVS" ]; then rm -rf "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
+ for x in `ls site-lib-src`; do if [ "$$x" != "CVS" ]; then rm -rf "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
.PHONY: install-config
install-config:
- mkdir -p "`dirname \"$(prefix)$(OCAMLFIND_CONF)\"`"
- @if [ -f "$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi
- test -f "$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(prefix)$(OCAMLFIND_CONF)"
+ mkdir -p "`dirname \"$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)\"`"
+ @if [ -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(DESTDIR)$(prefix)$(OCAMLFIND_CONF) !!!"; fi
+ test -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)"
.PHONY: uninstall-config
uninstall-config:
Index: findlib-1.5.3/src/findlib-toolbox/Makefile
===================================================================
--- findlib-1.5.3.orig/src/findlib-toolbox/Makefile
+++ findlib-1.5.3/src/findlib-toolbox/Makefile
@@ -13,7 +13,7 @@ make_wizard$(EXEC_SUFFIX): make_wizard.m
findlib.cma make_wizard.ml
install:
- cp make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(prefix)$(OCAML_SITELIB)/findlib
+ cp make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(DESTDIR)$(prefix)$(OCAML_SITELIB)/findlib
# uninstall: Nothing to do, because the removal of the findlib core also
# deinstalls the make_wizard
Index: findlib-1.5.3/src/findlib/Makefile
===================================================================
--- findlib-1.5.3.orig/src/findlib/Makefile
+++ findlib-1.5.3/src/findlib/Makefile
@@ -87,30 +87,30 @@ clean:
#rm -f ocaml_args.ml
install: all
- mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
- mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
+ 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 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)"; }; \
- cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
+ cp $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
# the following "if" block is only needed for 4.00beta2
if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \
cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \
- cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
+ cp topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
fi
install-num-top:
- mkdir -p "$(prefix)$(OCAML_SITELIB)/num-top"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
cp num_top.cma num_top.cmi num_top_printers.cmi \
- "$(prefix)$(OCAML_SITELIB)/num-top"
+ "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
# Note: uninstall-num-top is part of the removal of the META files.
uninstall:
- rm -f $(prefix)$(OCAML_CORE_STDLIB)/findlib
- rm -rf $(prefix)$(OCAML_SITELIB)/$(NAME)
- rm -f $(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)
+ rm -f $(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)/findlib
+ rm -rf $(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)
depend: *.ml *.mli fl_meta.ml fl_metascanner.ml
Reference in New Issue View Git Blame Copy Permalink