From 3f57981943960b5f1f02342cf342d22e93c6ef09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Glondu?= Date: Wed, 19 Jul 2017 10:01:14 +0200 Subject: Import ocaml-reins_0.1a-7.debian.tar.xz [dgit import tarball ocaml-reins 0.1a-7 ocaml-reins_0.1a-7.debian.tar.xz] --- changelog | 71 +++++++++++ compat | 1 + control | 44 +++++++ copyright | 33 +++++ dirs | 0 docs | 0 gbp.conf | 2 + patches/0001-Fix-PREFIX-handling.patch | 26 ++++ patches/0002-Install-cmi.patch | 19 +++ patches/0003-Fix-test-suite-with-new-oUnit.patch | 35 ++++++ patches/0004-Fix-version-in-META.patch | 20 +++ patches/0005-Fix-FTBFS-with-OCaml-4.02.3.patch | 21 ++++ ...ble-blocking-warnings-new-in-OCaml-4.05.0.patch | 21 ++++ ...-module-type-of-to-avoid-FTBFS-with-OCaml.patch | 138 +++++++++++++++++++++ patches/series | 7 ++ rules | 25 ++++ source/format | 1 + watch | 9 ++ 18 files changed, 473 insertions(+) create mode 100644 changelog create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 dirs create mode 100644 docs create mode 100644 gbp.conf create mode 100644 patches/0001-Fix-PREFIX-handling.patch create mode 100644 patches/0002-Install-cmi.patch create mode 100644 patches/0003-Fix-test-suite-with-new-oUnit.patch create mode 100644 patches/0004-Fix-version-in-META.patch create mode 100644 patches/0005-Fix-FTBFS-with-OCaml-4.02.3.patch create mode 100644 patches/0006-Disable-blocking-warnings-new-in-OCaml-4.05.0.patch create mode 100644 patches/0007-Use-include-module-type-of-to-avoid-FTBFS-with-OCaml.patch create mode 100644 patches/series create mode 100755 rules create mode 100644 source/format create mode 100644 watch diff --git a/changelog b/changelog new file mode 100644 index 0000000..c307361 --- /dev/null +++ b/changelog @@ -0,0 +1,71 @@ +ocaml-reins (0.1a-7) unstable; urgency=medium + + * Team upload + * debian/patches: + + Disable blocking warnings new in OCaml 4.05.0 + + Use "include module type of" to avoid FTBFS with OCaml 4.05.0 + * Update Vcs-* + * Bump debhelper compat to 10 + + -- Stéphane Glondu Wed, 19 Jul 2017 10:01:14 +0200 + +ocaml-reins (0.1a-6) unstable; urgency=medium + + * Team upload. + * Fix FTBFS with OCaml 4.02.3 + + -- Mehdi Dogguy Fri, 16 Oct 2015 22:48:32 +0200 + +ocaml-reins (0.1a-5) unstable; urgency=medium + + * Team upload + * debian/patches: + + Fix test-suite with new oUnit (Closes: #713499) + + Fix version in META + * Remove myself from Uploaders + * Update Vcs-* + * Add ocaml-findlib to Suggests + + -- Stéphane Glondu Thu, 30 Jan 2014 14:56:07 +0100 + +ocaml-reins (0.1a-4) unstable; urgency=low + + * Team upload. + * Set a dummy HOME when calling omake (fixes FTBFS on buildds where + HOME is not set). + + -- Mehdi Dogguy Thu, 21 Apr 2011 22:06:00 +0200 + +ocaml-reins (0.1a-3) unstable; urgency=low + + * Switch to dh-ocaml 0.9 + * Switch to format 3.0 (quilt) + * debian/control: + - update my e-mail address, remove DMUA + - update Standards-Version to 3.8.3 (no changes) + + -- Stéphane Glondu Sun, 20 Dec 2009 02:37:35 +0100 + +ocaml-reins (0.1a-2) unstable; urgency=low + + [ Stefano Zacchiroli ] + * promote Homepage to a real debian/control field, now that dpkg supports it + + [ Stephane Glondu ] + * Switch packaging to git + * Switch patches to quilt, add README.source + * Use dh and bump debhelper compatibility level to 7 + * debian/control: + - set Maintainer to d-o-m, add Mike and myself to Uploaders + - move to section ocaml + - update Standards-Version to 3.8.2 + - add versioned dependency on omake to avoid buggy package + * Switch debian/copyright to new format + + -- Stephane Glondu Sat, 04 Jul 2009 17:01:39 +0200 + +ocaml-reins (0.1a-1) unstable; urgency=low + + * Initial release (Closes: #445039) + + -- Mike Furr Tue, 02 Oct 2007 16:35:40 -0400 diff --git a/compat b/compat new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +10 diff --git a/control b/control new file mode 100644 index 0000000..86a8e1e --- /dev/null +++ b/control @@ -0,0 +1,44 @@ +Source: ocaml-reins +Section: ocaml +Priority: optional +Maintainer: Debian OCaml Maintainers +Uploaders: + Mike Furr +Build-Depends: + debhelper (>= 10), + ocaml-nox (>= 3.11.1-3~), + omake (>= 0.9.8.5-3-6), + libounit-ocaml-dev (>= 1.0.3-4~), + ocaml-findlib (>= 1.2.5), + dh-ocaml (>= 0.9) +Standards-Version: 3.8.3 +Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml-reins.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml-reins.git +Homepage: http://ocaml-reins.sourceforge.net/ + +Package: libreins-ocaml-dev +Architecture: any +Depends: + ${ocaml:Depends}, + ${shlibs:Depends}, + ${misc:Depends} +Provides: ${ocaml:Provides} +Suggests: ocaml-findlib +Description: data structure library for OCaml + The OCaml Reins data structure library consists of the following + persistent implementations: + * Lists (singly, O(1) catenable, Acyclic doubly linked, + random access) + * Sets/Maps (AVL, Red/Black, Patricia, Splay) + * Heaps (Binomial, Skew-Binomial) + . + All of the implementations conform to a unified signature for each + data type. Also, each data types include zipper style cursor + interfaces and persistent, bi-directional cursor based iterators. + The library also includes a set of standard modules to hoist the base + typs into the module level (Int, Bool, etc...) as well as a + collection of functor combinators to minimize boilerplate (e.g., for + constructing compare or to_string functions). Finally, a + quickcheck-like random testing framework is included and each data + type supports the necessary "gen" function to generate a random + instance of the type. diff --git a/copyright b/copyright new file mode 100644 index 0000000..dea3ba6 --- /dev/null +++ b/copyright @@ -0,0 +1,33 @@ +Packaged-By: Mike Furr +Packaged-Date: Tue, 02 Oct 2007 16:35:40 -0400 +Original-Source-Location: http://ocaml-reins.sourceforge.net/ +Upstream-Author: Mike Furr + +Files: * +Copyright: © 2007 Mike Furr +License: LGPL-2.1 | other + + The OCaml Reins library is distributed under the terms of the Lesser + General Public License version 2.1 (provided in the file + /usr/share/common-licenses/LGPL-2.1) with the following linking + exception. + + As a special exception to the GNU Lesser General Public License, you + may link, statically or dynamically, a "work that uses the Library" + with a publicly distributed version of the Library to produce an + executable file containing portions of the Library, and distribute + that executable file under terms of your choice, without any of the + additional requirements listed in clause 6 of the GNU Lesser General + Public License. By "a publicly distributed version of the Library", + we mean either the unmodified Library as distributed by the official + ocaml-reins website (currently ocaml-reins.sourceforge.net), or a + modified version of the Library that is distributed under the + conditions defined in clause 3 of the GNU Lesser General Public + License. This exception does not however invalidate any other + reasons why the executable file might be covered by the GNU Lesser + General Public License. + +Files: debian/* +Copyright: © 2007 Mike Furr + © 2009 Stéphane Glondu +License: GPL-2+ diff --git a/dirs b/dirs new file mode 100644 index 0000000..e69de29 diff --git a/docs b/docs new file mode 100644 index 0000000..e69de29 diff --git a/gbp.conf b/gbp.conf new file mode 100644 index 0000000..cec628c --- /dev/null +++ b/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True diff --git a/patches/0001-Fix-PREFIX-handling.patch b/patches/0001-Fix-PREFIX-handling.patch new file mode 100644 index 0000000..4284299 --- /dev/null +++ b/patches/0001-Fix-PREFIX-handling.patch @@ -0,0 +1,26 @@ +From: Mike Furr +Date: Sat, 4 Jul 2009 14:48:29 +0200 +Subject: Fix PREFIX handling + +--- + config.omake | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/config.omake b/config.omake +index 4417254..7a35fc2 100644 +--- a/config.omake ++++ b/config.omake +@@ -7,7 +7,12 @@ static. = + exit 1 + OCAMLDEP_MODULES_ENABLED = $(OCAMLDEP_MODULES_AVAILABLE) + OCAMLDEP=$(OCAMLDEP_MODULES) +- PREFIX=$(shell ocamlc -where) ++ if $(not $(defined PREFIX)) ++ PREFIX=$(shell ocamlc -where) ++ export ++ if $(defined-env OCAMLFIND_DESTDIR) ++ PREFIX = $(getenv OCAMLFIND_DESTDIR) ++ export + VERSION=0.1a + ConfMsgChecking(oUnit) + OUNIT_DIR=$(shell ocamlfind query oUnit) diff --git a/patches/0002-Install-cmi.patch b/patches/0002-Install-cmi.patch new file mode 100644 index 0000000..ec4559a --- /dev/null +++ b/patches/0002-Install-cmi.patch @@ -0,0 +1,19 @@ +From: Mike Furr +Date: Sat, 4 Jul 2009 14:48:41 +0200 +Subject: Install cmi + +--- + src/OMakefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/OMakefile b/src/OMakefile +index 983799d..e85608c 100644 +--- a/src/OMakefile ++++ b/src/OMakefile +@@ -52,5 +52,5 @@ REINS_CMX=$(if $(NATIVE_ENABLED), reins.cmx) + + install: META $(REINS_LIB) + mkdir -p $(PREFIX)/reins +- ocamlfind install reins META $(REINS_LIB) $(REINS_CMX) \ ++ ocamlfind install reins META $(REINS_LIB) $(REINS_CMX) reins.cmi \ + $(filter-exists $(addsuffix .mli, $(FILES))) diff --git a/patches/0003-Fix-test-suite-with-new-oUnit.patch b/patches/0003-Fix-test-suite-with-new-oUnit.patch new file mode 100644 index 0000000..37e7d24 --- /dev/null +++ b/patches/0003-Fix-test-suite-with-new-oUnit.patch @@ -0,0 +1,35 @@ +From: Stephane Glondu +Date: Thu, 30 Jan 2014 14:39:23 +0100 +Subject: Fix test-suite with new oUnit + +This is a part of https://github.com/ocaml/opam-repository/blob/master/packages/reins/reins.0.1a/files/fix_build.patch + +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713499 +--- + test/unit/OMakefile | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/test/unit/OMakefile b/test/unit/OMakefile +index 565c83d..4ec66c9 100644 +--- a/test/unit/OMakefile ++++ b/test/unit/OMakefile +@@ -1,9 +1,8 @@ + + TESTDIRS = list heap set map + +-OCAMLINCLUDES += \ +- $(shell $(OCAMLFIND) query oUnit) \ +- $(ROOT)/src ++OCAMLPACKS [] = oUnit num ++OCAMLINCLUDES += $(ROOT)/src + + FILES[] = + test_helper +@@ -17,7 +16,6 @@ FILES[] = + OCAMLINCLUDES += $(TESTDIRS) + + OCAML_LIBS = $(ROOT)/src/reins +-OCAML_OTHER_LIBS += str nums unix oUnit + TEST_PROGRAM = $(OCamlProgram run_unit_tests, $(FILES)) + + unit_tests.results: $(TEST_PROGRAM) diff --git a/patches/0004-Fix-version-in-META.patch b/patches/0004-Fix-version-in-META.patch new file mode 100644 index 0000000..d915927 --- /dev/null +++ b/patches/0004-Fix-version-in-META.patch @@ -0,0 +1,20 @@ +From: Stephane Glondu +Date: Thu, 30 Jan 2014 14:54:58 +0100 +Subject: Fix version in META + +This is a part of https://github.com/ocaml/opam-repository/blob/master/packages/reins/reins.0.1a/files/fix_build.patch +--- + src/META.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/META.in b/src/META.in +index 6cbc725..cbdb0a3 100644 +--- a/src/META.in ++++ b/src/META.in +@@ -1,3 +1,3 @@ +-version="0.1" ++version="0.1a" + archive(byte)="reins.cma" +-archive(native)="reins.cmxa" +\ No newline at end of file ++archive(native)="reins.cmxa" diff --git a/patches/0005-Fix-FTBFS-with-OCaml-4.02.3.patch b/patches/0005-Fix-FTBFS-with-OCaml-4.02.3.patch new file mode 100644 index 0000000..916bf18 --- /dev/null +++ b/patches/0005-Fix-FTBFS-with-OCaml-4.02.3.patch @@ -0,0 +1,21 @@ +From: Mehdi Dogguy +Date: Fri, 16 Oct 2015 22:45:57 +0200 +Subject: Fix FTBFS with OCaml 4.02.3 + +--- + OMakefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/OMakefile b/OMakefile +index b741412..c5b6a4e 100644 +--- a/OMakefile ++++ b/OMakefile +@@ -1,7 +1,7 @@ + + include config.omake + +-OCAMLFLAGS += -dtypes ++OCAMLFLAGS += -dtypes -w +a-3-4-27-50-k + + .SUBDIRS: src doc + diff --git a/patches/0006-Disable-blocking-warnings-new-in-OCaml-4.05.0.patch b/patches/0006-Disable-blocking-warnings-new-in-OCaml-4.05.0.patch new file mode 100644 index 0000000..ac15cfb --- /dev/null +++ b/patches/0006-Disable-blocking-warnings-new-in-OCaml-4.05.0.patch @@ -0,0 +1,21 @@ +From: Stephane Glondu +Date: Wed, 19 Jul 2017 09:48:26 +0200 +Subject: Disable blocking warnings new in OCaml 4.05.0 + +--- + OMakefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/OMakefile b/OMakefile +index c5b6a4e..4d15909 100644 +--- a/OMakefile ++++ b/OMakefile +@@ -1,7 +1,7 @@ + + include config.omake + +-OCAMLFLAGS += -dtypes -w +a-3-4-27-50-k ++OCAMLFLAGS += -dtypes -w +a-3-4-27-50-52-60-k + + .SUBDIRS: src doc + diff --git a/patches/0007-Use-include-module-type-of-to-avoid-FTBFS-with-OCaml.patch b/patches/0007-Use-include-module-type-of-to-avoid-FTBFS-with-OCaml.patch new file mode 100644 index 0000000..3ba68d8 --- /dev/null +++ b/patches/0007-Use-include-module-type-of-to-avoid-FTBFS-with-OCaml.patch @@ -0,0 +1,138 @@ +From: Stephane Glondu +Date: Wed, 19 Jul 2017 09:58:29 +0200 +Subject: Use "include module type of" to avoid FTBFS with OCaml 4.05.0 + +--- + src/base/types.mli | 105 ++--------------------------------------------------- + 1 file changed, 3 insertions(+), 102 deletions(-) + +diff --git a/src/base/types.mli b/src/base/types.mli +index c5be9d9..f5e661c 100644 +--- a/src/base/types.mli ++++ b/src/base/types.mli +@@ -294,38 +294,7 @@ end + + module Int32 : + sig +- val zero : int32 +- val one : int32 +- val minus_one : int32 +- external neg : int32 -> int32 = "%int32_neg" +- external add : int32 -> int32 -> int32 = "%int32_add" +- external sub : int32 -> int32 -> int32 = "%int32_sub" +- external mul : int32 -> int32 -> int32 = "%int32_mul" +- external div : int32 -> int32 -> int32 = "%int32_div" +- external rem : int32 -> int32 -> int32 = "%int32_mod" +- val succ : int32 -> int32 +- val pred : int32 -> int32 +- val abs : int32 -> int32 +- val max_int : int32 +- val min_int : int32 +- external logand : int32 -> int32 -> int32 = "%int32_and" +- external logor : int32 -> int32 -> int32 = "%int32_or" +- external logxor : int32 -> int32 -> int32 = "%int32_xor" +- val lognot : int32 -> int32 +- external shift_left : int32 -> int -> int32 = "%int32_lsl" +- external shift_right : int32 -> int -> int32 = "%int32_asr" +- external shift_right_logical : int32 -> int -> int32 = "%int32_lsr" +- external of_int : int -> int32 = "%int32_of_int" +- external to_int : int32 -> int = "%int32_to_int" +- external of_float : float -> int32 = "caml_int32_of_float" +- external to_float : int32 -> float = "caml_int32_to_float" +- external of_string : string -> int32 = "caml_int32_of_string" +- val to_string : int32 -> string +- external bits_of_float : float -> int32 = "caml_int32_bits_of_float" +- external float_of_bits : int32 -> float = "caml_int32_float_of_bits" +- type t = int32 +- val compare : t -> t -> int +- external format : string -> int32 -> string = "caml_int32_format" ++ include module type of Int32 + val equal : t -> t -> bool + val hash : 'a -> int + val gen : ?size:'a -> Random.State.t -> Int32.t +@@ -333,42 +302,7 @@ end + + module Int64 : + sig +- val zero : int64 +- val one : int64 +- val minus_one : int64 +- external neg : int64 -> int64 = "%int64_neg" +- external add : int64 -> int64 -> int64 = "%int64_add" +- external sub : int64 -> int64 -> int64 = "%int64_sub" +- external mul : int64 -> int64 -> int64 = "%int64_mul" +- external div : int64 -> int64 -> int64 = "%int64_div" +- external rem : int64 -> int64 -> int64 = "%int64_mod" +- val succ : int64 -> int64 +- val pred : int64 -> int64 +- val abs : int64 -> int64 +- val max_int : int64 +- val min_int : int64 +- external logand : int64 -> int64 -> int64 = "%int64_and" +- external logor : int64 -> int64 -> int64 = "%int64_or" +- external logxor : int64 -> int64 -> int64 = "%int64_xor" +- val lognot : int64 -> int64 +- external shift_left : int64 -> int -> int64 = "%int64_lsl" +- external shift_right : int64 -> int -> int64 = "%int64_asr" +- external shift_right_logical : int64 -> int -> int64 = "%int64_lsr" +- external of_int : int -> int64 = "%int64_of_int" +- external to_int : int64 -> int = "%int64_to_int" +- external of_float : float -> int64 = "caml_int64_of_float" +- external to_float : int64 -> float = "caml_int64_to_float" +- external of_int32 : int32 -> int64 = "%int64_of_int32" +- external to_int32 : int64 -> int32 = "%int64_to_int32" +- external of_nativeint : nativeint -> int64 = "%int64_of_nativeint" +- external to_nativeint : int64 -> nativeint = "%int64_to_nativeint" +- external of_string : string -> int64 = "caml_int64_of_string" +- val to_string : int64 -> string +- external bits_of_float : float -> int64 = "caml_int64_bits_of_float" +- external float_of_bits : int64 -> float = "caml_int64_float_of_bits" +- type t = int64 +- val compare : t -> t -> int +- external format : string -> int64 -> string = "caml_int64_format" ++ include module type of Int64 + val equal : t -> t -> bool + val hash : 'a -> int + val gen : ?size:'a -> Random.State.t -> Int64.t +@@ -376,40 +310,7 @@ end + + module Nativeint : + sig +- val zero : nativeint +- val one : nativeint +- val minus_one : nativeint +- external neg : nativeint -> nativeint = "%nativeint_neg" +- external add : nativeint -> nativeint -> nativeint = "%nativeint_add" +- external sub : nativeint -> nativeint -> nativeint = "%nativeint_sub" +- external mul : nativeint -> nativeint -> nativeint = "%nativeint_mul" +- external div : nativeint -> nativeint -> nativeint = "%nativeint_div" +- external rem : nativeint -> nativeint -> nativeint = "%nativeint_mod" +- val succ : nativeint -> nativeint +- val pred : nativeint -> nativeint +- val abs : nativeint -> nativeint +- val size : int +- val max_int : nativeint +- val min_int : nativeint +- external logand : nativeint -> nativeint -> nativeint = "%nativeint_and" +- external logor : nativeint -> nativeint -> nativeint = "%nativeint_or" +- external logxor : nativeint -> nativeint -> nativeint = "%nativeint_xor" +- val lognot : nativeint -> nativeint +- external shift_left : nativeint -> int -> nativeint = "%nativeint_lsl" +- external shift_right : nativeint -> int -> nativeint = "%nativeint_asr" +- external shift_right_logical : nativeint -> int -> nativeint +- = "%nativeint_lsr" +- external of_int : int -> nativeint = "%nativeint_of_int" +- external to_int : nativeint -> int = "%nativeint_to_int" +- external of_float : float -> nativeint = "caml_nativeint_of_float" +- external to_float : nativeint -> float = "caml_nativeint_to_float" +- external of_int32 : int32 -> nativeint = "%nativeint_of_int32" +- external to_int32 : nativeint -> int32 = "%nativeint_to_int32" +- external of_string : string -> nativeint = "caml_nativeint_of_string" +- val to_string : nativeint -> string +- type t = nativeint +- val compare : t -> t -> int +- external format : string -> nativeint -> string = "caml_nativeint_format" ++ include module type of Nativeint + val equal : t -> t -> bool + val hash : 'a -> int + val gen : ?size:'a -> Random.State.t -> Nativeint.t diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..b963721 --- /dev/null +++ b/patches/series @@ -0,0 +1,7 @@ +0001-Fix-PREFIX-handling.patch +0002-Install-cmi.patch +0003-Fix-test-suite-with-new-oUnit.patch +0004-Fix-version-in-META.patch +0005-Fix-FTBFS-with-OCaml-4.02.3.patch +0006-Disable-blocking-warnings-new-in-OCaml-4.05.0.patch +0007-Use-include-module-type-of-to-avoid-FTBFS-with-OCaml.patch diff --git a/rules b/rules new file mode 100755 index 0000000..98eb655 --- /dev/null +++ b/rules @@ -0,0 +1,25 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +include /usr/share/ocaml/ocamlvars.mk + +DEST := $(CURDIR)/debian/libreins-ocaml-dev/$(OCAML_STDLIB_DIR) + +%: + dh $@ --with ocaml + +.PHONY: override_dh_auto_build +override_dh_auto_build: + HOME=/nonexistant OCAMLFIND_DESTDIR=$(DEST) omake --config + +.PHONY: override_dh_auto_clean +override_dh_auto_clean: + HOME=/nonexistant omake clean + rm -f .omake* + find . -iname \*.omc -exec rm -f \{\} \; + find . -iname \*.annot -exec rm -f \{\} \; + rm -f doc/html/api/* + +.PHONY: override_dh_auto_install +override_dh_auto_install: + HOME=/nonexistant OCAMLFIND_DESTDIR=$(DEST) omake install diff --git a/source/format b/source/format new file mode 100644 index 0000000..46ebe02 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) \ No newline at end of file diff --git a/watch b/watch new file mode 100644 index 0000000..1a9f12d --- /dev/null +++ b/watch @@ -0,0 +1,9 @@ +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +# Uncomment to find new files on sourceforge, for debscripts >= 2.9 +http://sf.net/ocaml-reins/ocaml-reins-(.*)\.tar\.gz + + -- cgit v1.2.3 From 968a1f9030fb307f6f28dfe24b179f91c1769aa0 Mon Sep 17 00:00:00 2001 From: Mike Furr Date: Sat, 4 Jul 2009 14:48:29 +0200 Subject: Fix PREFIX handling Gbp-Pq: Name 0001-Fix-PREFIX-handling.patch --- config.omake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config.omake b/config.omake index 4417254..7a35fc2 100644 --- a/config.omake +++ b/config.omake @@ -7,7 +7,12 @@ static. = exit 1 OCAMLDEP_MODULES_ENABLED = $(OCAMLDEP_MODULES_AVAILABLE) OCAMLDEP=$(OCAMLDEP_MODULES) - PREFIX=$(shell ocamlc -where) + if $(not $(defined PREFIX)) + PREFIX=$(shell ocamlc -where) + export + if $(defined-env OCAMLFIND_DESTDIR) + PREFIX = $(getenv OCAMLFIND_DESTDIR) + export VERSION=0.1a ConfMsgChecking(oUnit) OUNIT_DIR=$(shell ocamlfind query oUnit) -- cgit v1.2.3 From 17e65db7f58944a7c4be5da7c4a87149941a8292 Mon Sep 17 00:00:00 2001 From: Mike Furr Date: Sat, 4 Jul 2009 14:48:41 +0200 Subject: Install cmi Gbp-Pq: Name 0002-Install-cmi.patch --- src/OMakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OMakefile b/src/OMakefile index 983799d..e85608c 100644 --- a/src/OMakefile +++ b/src/OMakefile @@ -52,5 +52,5 @@ REINS_CMX=$(if $(NATIVE_ENABLED), reins.cmx) install: META $(REINS_LIB) mkdir -p $(PREFIX)/reins - ocamlfind install reins META $(REINS_LIB) $(REINS_CMX) \ + ocamlfind install reins META $(REINS_LIB) $(REINS_CMX) reins.cmi \ $(filter-exists $(addsuffix .mli, $(FILES))) -- cgit v1.2.3 From cabcbf64279321f6a8da22a1c11104a4344180c1 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Thu, 30 Jan 2014 14:39:23 +0100 Subject: Fix test-suite with new oUnit This is a part of https://github.com/ocaml/opam-repository/blob/master/packages/reins/reins.0.1a/files/fix_build.patch Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713499 Gbp-Pq: Name 0003-Fix-test-suite-with-new-oUnit.patch --- test/unit/OMakefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/unit/OMakefile b/test/unit/OMakefile index 565c83d..4ec66c9 100644 --- a/test/unit/OMakefile +++ b/test/unit/OMakefile @@ -1,9 +1,8 @@ TESTDIRS = list heap set map -OCAMLINCLUDES += \ - $(shell $(OCAMLFIND) query oUnit) \ - $(ROOT)/src +OCAMLPACKS [] = oUnit num +OCAMLINCLUDES += $(ROOT)/src FILES[] = test_helper @@ -17,7 +16,6 @@ FILES[] = OCAMLINCLUDES += $(TESTDIRS) OCAML_LIBS = $(ROOT)/src/reins -OCAML_OTHER_LIBS += str nums unix oUnit TEST_PROGRAM = $(OCamlProgram run_unit_tests, $(FILES)) unit_tests.results: $(TEST_PROGRAM) -- cgit v1.2.3 From 7fc3b8e2b16cc18f1361790ea44881ddadff72df Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Thu, 30 Jan 2014 14:54:58 +0100 Subject: Fix version in META This is a part of https://github.com/ocaml/opam-repository/blob/master/packages/reins/reins.0.1a/files/fix_build.patch Gbp-Pq: Name 0004-Fix-version-in-META.patch --- src/META.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/META.in b/src/META.in index 6cbc725..cbdb0a3 100644 --- a/src/META.in +++ b/src/META.in @@ -1,3 +1,3 @@ -version="0.1" +version="0.1a" archive(byte)="reins.cma" -archive(native)="reins.cmxa" \ No newline at end of file +archive(native)="reins.cmxa" -- cgit v1.2.3 From 472f888af08b1f9276a839f8cc081a08ae9c4fc6 Mon Sep 17 00:00:00 2001 From: Mehdi Dogguy Date: Fri, 16 Oct 2015 22:45:57 +0200 Subject: Fix FTBFS with OCaml 4.02.3 Gbp-Pq: Name 0005-Fix-FTBFS-with-OCaml-4.02.3.patch --- OMakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OMakefile b/OMakefile index b741412..c5b6a4e 100644 --- a/OMakefile +++ b/OMakefile @@ -1,7 +1,7 @@ include config.omake -OCAMLFLAGS += -dtypes +OCAMLFLAGS += -dtypes -w +a-3-4-27-50-k .SUBDIRS: src doc -- cgit v1.2.3 From ca3d6fbbe636f6fa591aee8c9a80d57c2214ec7f Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Wed, 19 Jul 2017 09:48:26 +0200 Subject: Disable blocking warnings new in OCaml 4.05.0 Gbp-Pq: Name 0006-Disable-blocking-warnings-new-in-OCaml-4.05.0.patch --- OMakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OMakefile b/OMakefile index c5b6a4e..4d15909 100644 --- a/OMakefile +++ b/OMakefile @@ -1,7 +1,7 @@ include config.omake -OCAMLFLAGS += -dtypes -w +a-3-4-27-50-k +OCAMLFLAGS += -dtypes -w +a-3-4-27-50-52-60-k .SUBDIRS: src doc -- cgit v1.2.3 From 4c0c5ed0ebb6a49330042ea6c6f570ee95e87056 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Wed, 19 Jul 2017 09:58:29 +0200 Subject: Use "include module type of" to avoid FTBFS with OCaml 4.05.0 Gbp-Pq: Name 0007-Use-include-module-type-of-to-avoid-FTBFS-with-OCaml.patch --- src/base/types.mli | 105 ++--------------------------------------------------- 1 file changed, 3 insertions(+), 102 deletions(-) diff --git a/src/base/types.mli b/src/base/types.mli index c5be9d9..f5e661c 100644 --- a/src/base/types.mli +++ b/src/base/types.mli @@ -294,38 +294,7 @@ end module Int32 : sig - val zero : int32 - val one : int32 - val minus_one : int32 - external neg : int32 -> int32 = "%int32_neg" - external add : int32 -> int32 -> int32 = "%int32_add" - external sub : int32 -> int32 -> int32 = "%int32_sub" - external mul : int32 -> int32 -> int32 = "%int32_mul" - external div : int32 -> int32 -> int32 = "%int32_div" - external rem : int32 -> int32 -> int32 = "%int32_mod" - val succ : int32 -> int32 - val pred : int32 -> int32 - val abs : int32 -> int32 - val max_int : int32 - val min_int : int32 - external logand : int32 -> int32 -> int32 = "%int32_and" - external logor : int32 -> int32 -> int32 = "%int32_or" - external logxor : int32 -> int32 -> int32 = "%int32_xor" - val lognot : int32 -> int32 - external shift_left : int32 -> int -> int32 = "%int32_lsl" - external shift_right : int32 -> int -> int32 = "%int32_asr" - external shift_right_logical : int32 -> int -> int32 = "%int32_lsr" - external of_int : int -> int32 = "%int32_of_int" - external to_int : int32 -> int = "%int32_to_int" - external of_float : float -> int32 = "caml_int32_of_float" - external to_float : int32 -> float = "caml_int32_to_float" - external of_string : string -> int32 = "caml_int32_of_string" - val to_string : int32 -> string - external bits_of_float : float -> int32 = "caml_int32_bits_of_float" - external float_of_bits : int32 -> float = "caml_int32_float_of_bits" - type t = int32 - val compare : t -> t -> int - external format : string -> int32 -> string = "caml_int32_format" + include module type of Int32 val equal : t -> t -> bool val hash : 'a -> int val gen : ?size:'a -> Random.State.t -> Int32.t @@ -333,42 +302,7 @@ end module Int64 : sig - val zero : int64 - val one : int64 - val minus_one : int64 - external neg : int64 -> int64 = "%int64_neg" - external add : int64 -> int64 -> int64 = "%int64_add" - external sub : int64 -> int64 -> int64 = "%int64_sub" - external mul : int64 -> int64 -> int64 = "%int64_mul" - external div : int64 -> int64 -> int64 = "%int64_div" - external rem : int64 -> int64 -> int64 = "%int64_mod" - val succ : int64 -> int64 - val pred : int64 -> int64 - val abs : int64 -> int64 - val max_int : int64 - val min_int : int64 - external logand : int64 -> int64 -> int64 = "%int64_and" - external logor : int64 -> int64 -> int64 = "%int64_or" - external logxor : int64 -> int64 -> int64 = "%int64_xor" - val lognot : int64 -> int64 - external shift_left : int64 -> int -> int64 = "%int64_lsl" - external shift_right : int64 -> int -> int64 = "%int64_asr" - external shift_right_logical : int64 -> int -> int64 = "%int64_lsr" - external of_int : int -> int64 = "%int64_of_int" - external to_int : int64 -> int = "%int64_to_int" - external of_float : float -> int64 = "caml_int64_of_float" - external to_float : int64 -> float = "caml_int64_to_float" - external of_int32 : int32 -> int64 = "%int64_of_int32" - external to_int32 : int64 -> int32 = "%int64_to_int32" - external of_nativeint : nativeint -> int64 = "%int64_of_nativeint" - external to_nativeint : int64 -> nativeint = "%int64_to_nativeint" - external of_string : string -> int64 = "caml_int64_of_string" - val to_string : int64 -> string - external bits_of_float : float -> int64 = "caml_int64_bits_of_float" - external float_of_bits : int64 -> float = "caml_int64_float_of_bits" - type t = int64 - val compare : t -> t -> int - external format : string -> int64 -> string = "caml_int64_format" + include module type of Int64 val equal : t -> t -> bool val hash : 'a -> int val gen : ?size:'a -> Random.State.t -> Int64.t @@ -376,40 +310,7 @@ end module Nativeint : sig - val zero : nativeint - val one : nativeint - val minus_one : nativeint - external neg : nativeint -> nativeint = "%nativeint_neg" - external add : nativeint -> nativeint -> nativeint = "%nativeint_add" - external sub : nativeint -> nativeint -> nativeint = "%nativeint_sub" - external mul : nativeint -> nativeint -> nativeint = "%nativeint_mul" - external div : nativeint -> nativeint -> nativeint = "%nativeint_div" - external rem : nativeint -> nativeint -> nativeint = "%nativeint_mod" - val succ : nativeint -> nativeint - val pred : nativeint -> nativeint - val abs : nativeint -> nativeint - val size : int - val max_int : nativeint - val min_int : nativeint - external logand : nativeint -> nativeint -> nativeint = "%nativeint_and" - external logor : nativeint -> nativeint -> nativeint = "%nativeint_or" - external logxor : nativeint -> nativeint -> nativeint = "%nativeint_xor" - val lognot : nativeint -> nativeint - external shift_left : nativeint -> int -> nativeint = "%nativeint_lsl" - external shift_right : nativeint -> int -> nativeint = "%nativeint_asr" - external shift_right_logical : nativeint -> int -> nativeint - = "%nativeint_lsr" - external of_int : int -> nativeint = "%nativeint_of_int" - external to_int : nativeint -> int = "%nativeint_to_int" - external of_float : float -> nativeint = "caml_nativeint_of_float" - external to_float : nativeint -> float = "caml_nativeint_to_float" - external of_int32 : int32 -> nativeint = "%nativeint_of_int32" - external to_int32 : nativeint -> int32 = "%nativeint_to_int32" - external of_string : string -> nativeint = "caml_nativeint_of_string" - val to_string : nativeint -> string - type t = nativeint - val compare : t -> t -> int - external format : string -> nativeint -> string = "caml_nativeint_format" + include module type of Nativeint val equal : t -> t -> bool val hash : 'a -> int val gen : ?size:'a -> Random.State.t -> Nativeint.t -- cgit v1.2.3 From 483a3277b2a8bc1b58c66297448b6698547844a6 Mon Sep 17 00:00:00 2001 From: Mike Furr Date: Sat, 4 Jul 2009 14:48:29 +0200 Subject: Fix PREFIX handling Gbp-Pq: Name 0001-Fix-PREFIX-handling.patch --- config.omake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config.omake b/config.omake index 4417254..7a35fc2 100644 --- a/config.omake +++ b/config.omake @@ -7,7 +7,12 @@ static. = exit 1 OCAMLDEP_MODULES_ENABLED = $(OCAMLDEP_MODULES_AVAILABLE) OCAMLDEP=$(OCAMLDEP_MODULES) - PREFIX=$(shell ocamlc -where) + if $(not $(defined PREFIX)) + PREFIX=$(shell ocamlc -where) + export + if $(defined-env OCAMLFIND_DESTDIR) + PREFIX = $(getenv OCAMLFIND_DESTDIR) + export VERSION=0.1a ConfMsgChecking(oUnit) OUNIT_DIR=$(shell ocamlfind query oUnit) -- cgit v1.2.3 From eaf6ecda6d8158399583b2b355aa289e06c9f3c8 Mon Sep 17 00:00:00 2001 From: Mike Furr Date: Sat, 4 Jul 2009 14:48:41 +0200 Subject: Install cmi Gbp-Pq: Name 0002-Install-cmi.patch --- src/OMakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OMakefile b/src/OMakefile index 983799d..e85608c 100644 --- a/src/OMakefile +++ b/src/OMakefile @@ -52,5 +52,5 @@ REINS_CMX=$(if $(NATIVE_ENABLED), reins.cmx) install: META $(REINS_LIB) mkdir -p $(PREFIX)/reins - ocamlfind install reins META $(REINS_LIB) $(REINS_CMX) \ + ocamlfind install reins META $(REINS_LIB) $(REINS_CMX) reins.cmi \ $(filter-exists $(addsuffix .mli, $(FILES))) -- cgit v1.2.3 From 39595db2f03521082f4dfa4d1d278ff81287027f Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Thu, 30 Jan 2014 14:39:23 +0100 Subject: Fix test-suite with new oUnit This is a part of https://github.com/ocaml/opam-repository/blob/master/packages/reins/reins.0.1a/files/fix_build.patch Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713499 Gbp-Pq: Name 0003-Fix-test-suite-with-new-oUnit.patch --- test/unit/OMakefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/unit/OMakefile b/test/unit/OMakefile index 565c83d..4ec66c9 100644 --- a/test/unit/OMakefile +++ b/test/unit/OMakefile @@ -1,9 +1,8 @@ TESTDIRS = list heap set map -OCAMLINCLUDES += \ - $(shell $(OCAMLFIND) query oUnit) \ - $(ROOT)/src +OCAMLPACKS [] = oUnit num +OCAMLINCLUDES += $(ROOT)/src FILES[] = test_helper @@ -17,7 +16,6 @@ FILES[] = OCAMLINCLUDES += $(TESTDIRS) OCAML_LIBS = $(ROOT)/src/reins -OCAML_OTHER_LIBS += str nums unix oUnit TEST_PROGRAM = $(OCamlProgram run_unit_tests, $(FILES)) unit_tests.results: $(TEST_PROGRAM) -- cgit v1.2.3 From bdd5f97623891a18d3e8dd5df933f58b2b206202 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Thu, 30 Jan 2014 14:54:58 +0100 Subject: Fix version in META This is a part of https://github.com/ocaml/opam-repository/blob/master/packages/reins/reins.0.1a/files/fix_build.patch Gbp-Pq: Name 0004-Fix-version-in-META.patch --- src/META.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/META.in b/src/META.in index 6cbc725..cbdb0a3 100644 --- a/src/META.in +++ b/src/META.in @@ -1,3 +1,3 @@ -version="0.1" +version="0.1a" archive(byte)="reins.cma" -archive(native)="reins.cmxa" \ No newline at end of file +archive(native)="reins.cmxa" -- cgit v1.2.3 From b075822cd0d7c743513bdeea9780246937bd0042 Mon Sep 17 00:00:00 2001 From: Mehdi Dogguy Date: Fri, 16 Oct 2015 22:45:57 +0200 Subject: Fix FTBFS with OCaml 4.02.3 Gbp-Pq: Name 0005-Fix-FTBFS-with-OCaml-4.02.3.patch --- OMakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OMakefile b/OMakefile index b741412..c5b6a4e 100644 --- a/OMakefile +++ b/OMakefile @@ -1,7 +1,7 @@ include config.omake -OCAMLFLAGS += -dtypes +OCAMLFLAGS += -dtypes -w +a-3-4-27-50-k .SUBDIRS: src doc -- cgit v1.2.3 From 4ff1439f28a7f80499e0747c4c22b6d138f58c9a Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Wed, 19 Jul 2017 09:48:26 +0200 Subject: Disable blocking warnings new in OCaml 4.05.0 Gbp-Pq: Name 0006-Disable-blocking-warnings-new-in-OCaml-4.05.0.patch --- OMakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OMakefile b/OMakefile index c5b6a4e..4d15909 100644 --- a/OMakefile +++ b/OMakefile @@ -1,7 +1,7 @@ include config.omake -OCAMLFLAGS += -dtypes -w +a-3-4-27-50-k +OCAMLFLAGS += -dtypes -w +a-3-4-27-50-52-60-k .SUBDIRS: src doc -- cgit v1.2.3 From 4f95aa9b0261de085da985251012a0342ba90a1e Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Wed, 19 Jul 2017 09:58:29 +0200 Subject: Use "include module type of" to avoid FTBFS with OCaml 4.05.0 Gbp-Pq: Name 0007-Use-include-module-type-of-to-avoid-FTBFS-with-OCaml.patch --- src/base/types.mli | 105 ++--------------------------------------------------- 1 file changed, 3 insertions(+), 102 deletions(-) diff --git a/src/base/types.mli b/src/base/types.mli index c5be9d9..f5e661c 100644 --- a/src/base/types.mli +++ b/src/base/types.mli @@ -294,38 +294,7 @@ end module Int32 : sig - val zero : int32 - val one : int32 - val minus_one : int32 - external neg : int32 -> int32 = "%int32_neg" - external add : int32 -> int32 -> int32 = "%int32_add" - external sub : int32 -> int32 -> int32 = "%int32_sub" - external mul : int32 -> int32 -> int32 = "%int32_mul" - external div : int32 -> int32 -> int32 = "%int32_div" - external rem : int32 -> int32 -> int32 = "%int32_mod" - val succ : int32 -> int32 - val pred : int32 -> int32 - val abs : int32 -> int32 - val max_int : int32 - val min_int : int32 - external logand : int32 -> int32 -> int32 = "%int32_and" - external logor : int32 -> int32 -> int32 = "%int32_or" - external logxor : int32 -> int32 -> int32 = "%int32_xor" - val lognot : int32 -> int32 - external shift_left : int32 -> int -> int32 = "%int32_lsl" - external shift_right : int32 -> int -> int32 = "%int32_asr" - external shift_right_logical : int32 -> int -> int32 = "%int32_lsr" - external of_int : int -> int32 = "%int32_of_int" - external to_int : int32 -> int = "%int32_to_int" - external of_float : float -> int32 = "caml_int32_of_float" - external to_float : int32 -> float = "caml_int32_to_float" - external of_string : string -> int32 = "caml_int32_of_string" - val to_string : int32 -> string - external bits_of_float : float -> int32 = "caml_int32_bits_of_float" - external float_of_bits : int32 -> float = "caml_int32_float_of_bits" - type t = int32 - val compare : t -> t -> int - external format : string -> int32 -> string = "caml_int32_format" + include module type of Int32 val equal : t -> t -> bool val hash : 'a -> int val gen : ?size:'a -> Random.State.t -> Int32.t @@ -333,42 +302,7 @@ end module Int64 : sig - val zero : int64 - val one : int64 - val minus_one : int64 - external neg : int64 -> int64 = "%int64_neg" - external add : int64 -> int64 -> int64 = "%int64_add" - external sub : int64 -> int64 -> int64 = "%int64_sub" - external mul : int64 -> int64 -> int64 = "%int64_mul" - external div : int64 -> int64 -> int64 = "%int64_div" - external rem : int64 -> int64 -> int64 = "%int64_mod" - val succ : int64 -> int64 - val pred : int64 -> int64 - val abs : int64 -> int64 - val max_int : int64 - val min_int : int64 - external logand : int64 -> int64 -> int64 = "%int64_and" - external logor : int64 -> int64 -> int64 = "%int64_or" - external logxor : int64 -> int64 -> int64 = "%int64_xor" - val lognot : int64 -> int64 - external shift_left : int64 -> int -> int64 = "%int64_lsl" - external shift_right : int64 -> int -> int64 = "%int64_asr" - external shift_right_logical : int64 -> int -> int64 = "%int64_lsr" - external of_int : int -> int64 = "%int64_of_int" - external to_int : int64 -> int = "%int64_to_int" - external of_float : float -> int64 = "caml_int64_of_float" - external to_float : int64 -> float = "caml_int64_to_float" - external of_int32 : int32 -> int64 = "%int64_of_int32" - external to_int32 : int64 -> int32 = "%int64_to_int32" - external of_nativeint : nativeint -> int64 = "%int64_of_nativeint" - external to_nativeint : int64 -> nativeint = "%int64_to_nativeint" - external of_string : string -> int64 = "caml_int64_of_string" - val to_string : int64 -> string - external bits_of_float : float -> int64 = "caml_int64_bits_of_float" - external float_of_bits : int64 -> float = "caml_int64_float_of_bits" - type t = int64 - val compare : t -> t -> int - external format : string -> int64 -> string = "caml_int64_format" + include module type of Int64 val equal : t -> t -> bool val hash : 'a -> int val gen : ?size:'a -> Random.State.t -> Int64.t @@ -376,40 +310,7 @@ end module Nativeint : sig - val zero : nativeint - val one : nativeint - val minus_one : nativeint - external neg : nativeint -> nativeint = "%nativeint_neg" - external add : nativeint -> nativeint -> nativeint = "%nativeint_add" - external sub : nativeint -> nativeint -> nativeint = "%nativeint_sub" - external mul : nativeint -> nativeint -> nativeint = "%nativeint_mul" - external div : nativeint -> nativeint -> nativeint = "%nativeint_div" - external rem : nativeint -> nativeint -> nativeint = "%nativeint_mod" - val succ : nativeint -> nativeint - val pred : nativeint -> nativeint - val abs : nativeint -> nativeint - val size : int - val max_int : nativeint - val min_int : nativeint - external logand : nativeint -> nativeint -> nativeint = "%nativeint_and" - external logor : nativeint -> nativeint -> nativeint = "%nativeint_or" - external logxor : nativeint -> nativeint -> nativeint = "%nativeint_xor" - val lognot : nativeint -> nativeint - external shift_left : nativeint -> int -> nativeint = "%nativeint_lsl" - external shift_right : nativeint -> int -> nativeint = "%nativeint_asr" - external shift_right_logical : nativeint -> int -> nativeint - = "%nativeint_lsr" - external of_int : int -> nativeint = "%nativeint_of_int" - external to_int : nativeint -> int = "%nativeint_to_int" - external of_float : float -> nativeint = "caml_nativeint_of_float" - external to_float : nativeint -> float = "caml_nativeint_to_float" - external of_int32 : int32 -> nativeint = "%nativeint_of_int32" - external to_int32 : nativeint -> int32 = "%nativeint_to_int32" - external of_string : string -> nativeint = "caml_nativeint_of_string" - val to_string : nativeint -> string - type t = nativeint - val compare : t -> t -> int - external format : string -> nativeint -> string = "caml_nativeint_format" + include module type of Nativeint val equal : t -> t -> bool val hash : 'a -> int val gen : ?size:'a -> Random.State.t -> Nativeint.t -- cgit v1.2.3 From 4357303e46f2db6700109090045c2070bf6bb6f3 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Sat, 7 Sep 2019 20:00:09 +0200 Subject: Fix compilation with OCaml 4.08.0 Gbp-Pq: Name 0008-Fix-compilation-with-OCaml-4.08.0.patch --- OMakefile | 2 +- src/base/types.ml | 2 +- src/base/types.mli | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OMakefile b/OMakefile index 4d15909..74c1f83 100644 --- a/OMakefile +++ b/OMakefile @@ -1,7 +1,7 @@ include config.omake -OCAMLFLAGS += -dtypes -w +a-3-4-27-50-52-60-k +OCAMLFLAGS += -dtypes -w +a-3-4-27-44-50-52-60-k .SUBDIRS: src doc diff --git a/src/base/types.ml b/src/base/types.ml index 0fea396..c080c97 100644 --- a/src/base/types.ml +++ b/src/base/types.ml @@ -380,7 +380,7 @@ module String = struct for i = 0 to (len-1) do s.[i] <- Char.gen ~size:size rs done; - s + Bytes.to_string s let to_string x = x end diff --git a/src/base/types.mli b/src/base/types.mli index f5e661c..b20a0d2 100644 --- a/src/base/types.mli +++ b/src/base/types.mli @@ -360,7 +360,7 @@ sig val big_int_of_nat : Nat.nat -> big_int val base_power_big_int : int -> int -> big_int -> big_int val sys_big_int_of_string : string -> int -> int -> big_int - val round_futur_last_digit : string -> int -> int -> bool + val round_futur_last_digit : bytes -> int -> int -> bool val approx_big_int : int -> big_int -> string type t = big_int val equal : big_int -> big_int -> bool @@ -485,13 +485,13 @@ module String : sig external length : string -> int = "%string_length" external get : string -> int -> char = "%string_safe_get" - external set : string -> int -> char -> unit = "%string_safe_set" - external create : int -> string = "caml_create_string" + external set : bytes -> int -> char -> unit = "%string_safe_set" + external create : int -> bytes = "caml_create_string" val make : int -> char -> string val copy : string -> string val sub : string -> int -> int -> string - val fill : string -> int -> int -> char -> unit - val blit : string -> int -> string -> int -> int -> unit + val fill : bytes -> int -> int -> char -> unit + val blit : string -> int -> bytes -> int -> int -> unit val concat : string -> string list -> string val iter : (char -> unit) -> string -> unit val escaped : string -> string @@ -509,11 +509,11 @@ sig type t = string val compare : t -> t -> int external unsafe_get : string -> int -> char = "%string_unsafe_get" - external unsafe_set : string -> int -> char -> unit + external unsafe_set : bytes -> int -> char -> unit = "%string_unsafe_set" - external unsafe_blit : string -> int -> string -> int -> int -> unit + external unsafe_blit : string -> int -> bytes -> int -> int -> unit = "caml_blit_string" "noalloc" - external unsafe_fill : string -> int -> int -> char -> unit + external unsafe_fill : bytes -> int -> int -> char -> unit = "caml_fill_string" "noalloc" val equal : t -> t -> bool val hash : 'a -> int -- cgit v1.2.3 From 3486229eb51d8026993462f99a7a69b7dcf6e98e Mon Sep 17 00:00:00 2001 From: Mike Furr Date: Sat, 4 Jul 2009 14:48:29 +0200 Subject: Fix PREFIX handling Gbp-Pq: Name 0001-Fix-PREFIX-handling.patch --- config.omake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config.omake b/config.omake index 4417254..7a35fc2 100644 --- a/config.omake +++ b/config.omake @@ -7,7 +7,12 @@ static. = exit 1 OCAMLDEP_MODULES_ENABLED = $(OCAMLDEP_MODULES_AVAILABLE) OCAMLDEP=$(OCAMLDEP_MODULES) - PREFIX=$(shell ocamlc -where) + if $(not $(defined PREFIX)) + PREFIX=$(shell ocamlc -where) + export + if $(defined-env OCAMLFIND_DESTDIR) + PREFIX = $(getenv OCAMLFIND_DESTDIR) + export VERSION=0.1a ConfMsgChecking(oUnit) OUNIT_DIR=$(shell ocamlfind query oUnit) -- cgit v1.2.3 From b1327c491ecb44530879d0d1bd81bec17f91f81d Mon Sep 17 00:00:00 2001 From: Mike Furr Date: Sat, 4 Jul 2009 14:48:41 +0200 Subject: Install cmi Gbp-Pq: Name 0002-Install-cmi.patch --- src/OMakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OMakefile b/src/OMakefile index 983799d..e85608c 100644 --- a/src/OMakefile +++ b/src/OMakefile @@ -52,5 +52,5 @@ REINS_CMX=$(if $(NATIVE_ENABLED), reins.cmx) install: META $(REINS_LIB) mkdir -p $(PREFIX)/reins - ocamlfind install reins META $(REINS_LIB) $(REINS_CMX) \ + ocamlfind install reins META $(REINS_LIB) $(REINS_CMX) reins.cmi \ $(filter-exists $(addsuffix .mli, $(FILES))) -- cgit v1.2.3 From 0a1b6b449b7f0384c204eb72be06e00cc8b3d9a9 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Thu, 30 Jan 2014 14:39:23 +0100 Subject: Fix test-suite with new oUnit This is a part of https://github.com/ocaml/opam-repository/blob/master/packages/reins/reins.0.1a/files/fix_build.patch Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713499 Gbp-Pq: Name 0003-Fix-test-suite-with-new-oUnit.patch --- test/unit/OMakefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/unit/OMakefile b/test/unit/OMakefile index 565c83d..4ec66c9 100644 --- a/test/unit/OMakefile +++ b/test/unit/OMakefile @@ -1,9 +1,8 @@ TESTDIRS = list heap set map -OCAMLINCLUDES += \ - $(shell $(OCAMLFIND) query oUnit) \ - $(ROOT)/src +OCAMLPACKS [] = oUnit num +OCAMLINCLUDES += $(ROOT)/src FILES[] = test_helper @@ -17,7 +16,6 @@ FILES[] = OCAMLINCLUDES += $(TESTDIRS) OCAML_LIBS = $(ROOT)/src/reins -OCAML_OTHER_LIBS += str nums unix oUnit TEST_PROGRAM = $(OCamlProgram run_unit_tests, $(FILES)) unit_tests.results: $(TEST_PROGRAM) -- cgit v1.2.3 From 27b5ad3884098ff9683ed8704de21fbbe76f6c35 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Thu, 30 Jan 2014 14:54:58 +0100 Subject: Fix version in META This is a part of https://github.com/ocaml/opam-repository/blob/master/packages/reins/reins.0.1a/files/fix_build.patch Gbp-Pq: Name 0004-Fix-version-in-META.patch --- src/META.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/META.in b/src/META.in index 6cbc725..cbdb0a3 100644 --- a/src/META.in +++ b/src/META.in @@ -1,3 +1,3 @@ -version="0.1" +version="0.1a" archive(byte)="reins.cma" -archive(native)="reins.cmxa" \ No newline at end of file +archive(native)="reins.cmxa" -- cgit v1.2.3 From fedfe82a13f0512b4ee4a559bc2ce21d9ef2a756 Mon Sep 17 00:00:00 2001 From: Mehdi Dogguy Date: Fri, 16 Oct 2015 22:45:57 +0200 Subject: Fix FTBFS with OCaml 4.02.3 Gbp-Pq: Name 0005-Fix-FTBFS-with-OCaml-4.02.3.patch --- OMakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OMakefile b/OMakefile index b741412..c5b6a4e 100644 --- a/OMakefile +++ b/OMakefile @@ -1,7 +1,7 @@ include config.omake -OCAMLFLAGS += -dtypes +OCAMLFLAGS += -dtypes -w +a-3-4-27-50-k .SUBDIRS: src doc -- cgit v1.2.3 From 5aeb0985be3567f051fde9832bb3530cd66e6a00 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Wed, 19 Jul 2017 09:48:26 +0200 Subject: Disable blocking warnings new in OCaml 4.05.0 Gbp-Pq: Name 0006-Disable-blocking-warnings-new-in-OCaml-4.05.0.patch --- OMakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OMakefile b/OMakefile index c5b6a4e..4d15909 100644 --- a/OMakefile +++ b/OMakefile @@ -1,7 +1,7 @@ include config.omake -OCAMLFLAGS += -dtypes -w +a-3-4-27-50-k +OCAMLFLAGS += -dtypes -w +a-3-4-27-50-52-60-k .SUBDIRS: src doc -- cgit v1.2.3 From 83999cacb63c333a124583386f675cf39a09692d Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Wed, 19 Jul 2017 09:58:29 +0200 Subject: Use "include module type of" to avoid FTBFS with OCaml 4.05.0 Gbp-Pq: Name 0007-Use-include-module-type-of-to-avoid-FTBFS-with-OCaml.patch --- src/base/types.mli | 105 ++--------------------------------------------------- 1 file changed, 3 insertions(+), 102 deletions(-) diff --git a/src/base/types.mli b/src/base/types.mli index c5be9d9..f5e661c 100644 --- a/src/base/types.mli +++ b/src/base/types.mli @@ -294,38 +294,7 @@ end module Int32 : sig - val zero : int32 - val one : int32 - val minus_one : int32 - external neg : int32 -> int32 = "%int32_neg" - external add : int32 -> int32 -> int32 = "%int32_add" - external sub : int32 -> int32 -> int32 = "%int32_sub" - external mul : int32 -> int32 -> int32 = "%int32_mul" - external div : int32 -> int32 -> int32 = "%int32_div" - external rem : int32 -> int32 -> int32 = "%int32_mod" - val succ : int32 -> int32 - val pred : int32 -> int32 - val abs : int32 -> int32 - val max_int : int32 - val min_int : int32 - external logand : int32 -> int32 -> int32 = "%int32_and" - external logor : int32 -> int32 -> int32 = "%int32_or" - external logxor : int32 -> int32 -> int32 = "%int32_xor" - val lognot : int32 -> int32 - external shift_left : int32 -> int -> int32 = "%int32_lsl" - external shift_right : int32 -> int -> int32 = "%int32_asr" - external shift_right_logical : int32 -> int -> int32 = "%int32_lsr" - external of_int : int -> int32 = "%int32_of_int" - external to_int : int32 -> int = "%int32_to_int" - external of_float : float -> int32 = "caml_int32_of_float" - external to_float : int32 -> float = "caml_int32_to_float" - external of_string : string -> int32 = "caml_int32_of_string" - val to_string : int32 -> string - external bits_of_float : float -> int32 = "caml_int32_bits_of_float" - external float_of_bits : int32 -> float = "caml_int32_float_of_bits" - type t = int32 - val compare : t -> t -> int - external format : string -> int32 -> string = "caml_int32_format" + include module type of Int32 val equal : t -> t -> bool val hash : 'a -> int val gen : ?size:'a -> Random.State.t -> Int32.t @@ -333,42 +302,7 @@ end module Int64 : sig - val zero : int64 - val one : int64 - val minus_one : int64 - external neg : int64 -> int64 = "%int64_neg" - external add : int64 -> int64 -> int64 = "%int64_add" - external sub : int64 -> int64 -> int64 = "%int64_sub" - external mul : int64 -> int64 -> int64 = "%int64_mul" - external div : int64 -> int64 -> int64 = "%int64_div" - external rem : int64 -> int64 -> int64 = "%int64_mod" - val succ : int64 -> int64 - val pred : int64 -> int64 - val abs : int64 -> int64 - val max_int : int64 - val min_int : int64 - external logand : int64 -> int64 -> int64 = "%int64_and" - external logor : int64 -> int64 -> int64 = "%int64_or" - external logxor : int64 -> int64 -> int64 = "%int64_xor" - val lognot : int64 -> int64 - external shift_left : int64 -> int -> int64 = "%int64_lsl" - external shift_right : int64 -> int -> int64 = "%int64_asr" - external shift_right_logical : int64 -> int -> int64 = "%int64_lsr" - external of_int : int -> int64 = "%int64_of_int" - external to_int : int64 -> int = "%int64_to_int" - external of_float : float -> int64 = "caml_int64_of_float" - external to_float : int64 -> float = "caml_int64_to_float" - external of_int32 : int32 -> int64 = "%int64_of_int32" - external to_int32 : int64 -> int32 = "%int64_to_int32" - external of_nativeint : nativeint -> int64 = "%int64_of_nativeint" - external to_nativeint : int64 -> nativeint = "%int64_to_nativeint" - external of_string : string -> int64 = "caml_int64_of_string" - val to_string : int64 -> string - external bits_of_float : float -> int64 = "caml_int64_bits_of_float" - external float_of_bits : int64 -> float = "caml_int64_float_of_bits" - type t = int64 - val compare : t -> t -> int - external format : string -> int64 -> string = "caml_int64_format" + include module type of Int64 val equal : t -> t -> bool val hash : 'a -> int val gen : ?size:'a -> Random.State.t -> Int64.t @@ -376,40 +310,7 @@ end module Nativeint : sig - val zero : nativeint - val one : nativeint - val minus_one : nativeint - external neg : nativeint -> nativeint = "%nativeint_neg" - external add : nativeint -> nativeint -> nativeint = "%nativeint_add" - external sub : nativeint -> nativeint -> nativeint = "%nativeint_sub" - external mul : nativeint -> nativeint -> nativeint = "%nativeint_mul" - external div : nativeint -> nativeint -> nativeint = "%nativeint_div" - external rem : nativeint -> nativeint -> nativeint = "%nativeint_mod" - val succ : nativeint -> nativeint - val pred : nativeint -> nativeint - val abs : nativeint -> nativeint - val size : int - val max_int : nativeint - val min_int : nativeint - external logand : nativeint -> nativeint -> nativeint = "%nativeint_and" - external logor : nativeint -> nativeint -> nativeint = "%nativeint_or" - external logxor : nativeint -> nativeint -> nativeint = "%nativeint_xor" - val lognot : nativeint -> nativeint - external shift_left : nativeint -> int -> nativeint = "%nativeint_lsl" - external shift_right : nativeint -> int -> nativeint = "%nativeint_asr" - external shift_right_logical : nativeint -> int -> nativeint - = "%nativeint_lsr" - external of_int : int -> nativeint = "%nativeint_of_int" - external to_int : nativeint -> int = "%nativeint_to_int" - external of_float : float -> nativeint = "caml_nativeint_of_float" - external to_float : nativeint -> float = "caml_nativeint_to_float" - external of_int32 : int32 -> nativeint = "%nativeint_of_int32" - external to_int32 : nativeint -> int32 = "%nativeint_to_int32" - external of_string : string -> nativeint = "caml_nativeint_of_string" - val to_string : nativeint -> string - type t = nativeint - val compare : t -> t -> int - external format : string -> nativeint -> string = "caml_nativeint_format" + include module type of Nativeint val equal : t -> t -> bool val hash : 'a -> int val gen : ?size:'a -> Random.State.t -> Nativeint.t -- cgit v1.2.3 From 6af90031447c29cf647cd26637f59694b0570337 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Sat, 7 Sep 2019 20:00:09 +0200 Subject: Fix compilation with OCaml 4.08.0 Gbp-Pq: Name 0008-Fix-compilation-with-OCaml-4.08.0.patch --- OMakefile | 2 +- src/base/types.ml | 2 +- src/base/types.mli | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OMakefile b/OMakefile index 4d15909..74c1f83 100644 --- a/OMakefile +++ b/OMakefile @@ -1,7 +1,7 @@ include config.omake -OCAMLFLAGS += -dtypes -w +a-3-4-27-50-52-60-k +OCAMLFLAGS += -dtypes -w +a-3-4-27-44-50-52-60-k .SUBDIRS: src doc diff --git a/src/base/types.ml b/src/base/types.ml index 0fea396..c080c97 100644 --- a/src/base/types.ml +++ b/src/base/types.ml @@ -380,7 +380,7 @@ module String = struct for i = 0 to (len-1) do s.[i] <- Char.gen ~size:size rs done; - s + Bytes.to_string s let to_string x = x end diff --git a/src/base/types.mli b/src/base/types.mli index f5e661c..b20a0d2 100644 --- a/src/base/types.mli +++ b/src/base/types.mli @@ -360,7 +360,7 @@ sig val big_int_of_nat : Nat.nat -> big_int val base_power_big_int : int -> int -> big_int -> big_int val sys_big_int_of_string : string -> int -> int -> big_int - val round_futur_last_digit : string -> int -> int -> bool + val round_futur_last_digit : bytes -> int -> int -> bool val approx_big_int : int -> big_int -> string type t = big_int val equal : big_int -> big_int -> bool @@ -485,13 +485,13 @@ module String : sig external length : string -> int = "%string_length" external get : string -> int -> char = "%string_safe_get" - external set : string -> int -> char -> unit = "%string_safe_set" - external create : int -> string = "caml_create_string" + external set : bytes -> int -> char -> unit = "%string_safe_set" + external create : int -> bytes = "caml_create_string" val make : int -> char -> string val copy : string -> string val sub : string -> int -> int -> string - val fill : string -> int -> int -> char -> unit - val blit : string -> int -> string -> int -> int -> unit + val fill : bytes -> int -> int -> char -> unit + val blit : string -> int -> bytes -> int -> int -> unit val concat : string -> string list -> string val iter : (char -> unit) -> string -> unit val escaped : string -> string @@ -509,11 +509,11 @@ sig type t = string val compare : t -> t -> int external unsafe_get : string -> int -> char = "%string_unsafe_get" - external unsafe_set : string -> int -> char -> unit + external unsafe_set : bytes -> int -> char -> unit = "%string_unsafe_set" - external unsafe_blit : string -> int -> string -> int -> int -> unit + external unsafe_blit : string -> int -> bytes -> int -> int -> unit = "caml_blit_string" "noalloc" - external unsafe_fill : string -> int -> int -> char -> unit + external unsafe_fill : bytes -> int -> int -> char -> unit = "caml_fill_string" "noalloc" val equal : t -> t -> bool val hash : 'a -> int -- cgit v1.2.3 From 1aa0063aa488e7d0601b0dd49f84d7dbe49dcae0 Mon Sep 17 00:00:00 2001 From: Mike Furr Date: Sat, 4 Jul 2009 14:48:29 +0200 Subject: Fix PREFIX handling Gbp-Pq: Name 0001-Fix-PREFIX-handling.patch --- config.omake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config.omake b/config.omake index 4417254..7a35fc2 100644 --- a/config.omake +++ b/config.omake @@ -7,7 +7,12 @@ static. = exit 1 OCAMLDEP_MODULES_ENABLED = $(OCAMLDEP_MODULES_AVAILABLE) OCAMLDEP=$(OCAMLDEP_MODULES) - PREFIX=$(shell ocamlc -where) + if $(not $(defined PREFIX)) + PREFIX=$(shell ocamlc -where) + export + if $(defined-env OCAMLFIND_DESTDIR) + PREFIX = $(getenv OCAMLFIND_DESTDIR) + export VERSION=0.1a ConfMsgChecking(oUnit) OUNIT_DIR=$(shell ocamlfind query oUnit) -- cgit v1.2.3 From 1267f3e2943c9a622786a716e864c52536128cea Mon Sep 17 00:00:00 2001 From: Mike Furr Date: Sat, 4 Jul 2009 14:48:41 +0200 Subject: Install cmi Gbp-Pq: Name 0002-Install-cmi.patch --- src/OMakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OMakefile b/src/OMakefile index 983799d..e85608c 100644 --- a/src/OMakefile +++ b/src/OMakefile @@ -52,5 +52,5 @@ REINS_CMX=$(if $(NATIVE_ENABLED), reins.cmx) install: META $(REINS_LIB) mkdir -p $(PREFIX)/reins - ocamlfind install reins META $(REINS_LIB) $(REINS_CMX) \ + ocamlfind install reins META $(REINS_LIB) $(REINS_CMX) reins.cmi \ $(filter-exists $(addsuffix .mli, $(FILES))) -- cgit v1.2.3 From e97a9e51199713ffffe49db9d936c909091de9a2 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Thu, 30 Jan 2014 14:39:23 +0100 Subject: Fix test-suite with new oUnit This is a part of https://github.com/ocaml/opam-repository/blob/master/packages/reins/reins.0.1a/files/fix_build.patch Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713499 Gbp-Pq: Name 0003-Fix-test-suite-with-new-oUnit.patch --- test/unit/OMakefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/unit/OMakefile b/test/unit/OMakefile index 565c83d..4ec66c9 100644 --- a/test/unit/OMakefile +++ b/test/unit/OMakefile @@ -1,9 +1,8 @@ TESTDIRS = list heap set map -OCAMLINCLUDES += \ - $(shell $(OCAMLFIND) query oUnit) \ - $(ROOT)/src +OCAMLPACKS [] = oUnit num +OCAMLINCLUDES += $(ROOT)/src FILES[] = test_helper @@ -17,7 +16,6 @@ FILES[] = OCAMLINCLUDES += $(TESTDIRS) OCAML_LIBS = $(ROOT)/src/reins -OCAML_OTHER_LIBS += str nums unix oUnit TEST_PROGRAM = $(OCamlProgram run_unit_tests, $(FILES)) unit_tests.results: $(TEST_PROGRAM) -- cgit v1.2.3 From 9d3fb7dea7fc190e20bfd0930a101b6c43627101 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Thu, 30 Jan 2014 14:54:58 +0100 Subject: Fix version in META This is a part of https://github.com/ocaml/opam-repository/blob/master/packages/reins/reins.0.1a/files/fix_build.patch Gbp-Pq: Name 0004-Fix-version-in-META.patch --- src/META.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/META.in b/src/META.in index 6cbc725..cbdb0a3 100644 --- a/src/META.in +++ b/src/META.in @@ -1,3 +1,3 @@ -version="0.1" +version="0.1a" archive(byte)="reins.cma" -archive(native)="reins.cmxa" \ No newline at end of file +archive(native)="reins.cmxa" -- cgit v1.2.3 From 0271fd4c7e4a2b6921eb69425d67aa41bc0d2c68 Mon Sep 17 00:00:00 2001 From: Mehdi Dogguy Date: Fri, 16 Oct 2015 22:45:57 +0200 Subject: Fix FTBFS with OCaml 4.02.3 Gbp-Pq: Name 0005-Fix-FTBFS-with-OCaml-4.02.3.patch --- OMakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OMakefile b/OMakefile index b741412..c5b6a4e 100644 --- a/OMakefile +++ b/OMakefile @@ -1,7 +1,7 @@ include config.omake -OCAMLFLAGS += -dtypes +OCAMLFLAGS += -dtypes -w +a-3-4-27-50-k .SUBDIRS: src doc -- cgit v1.2.3 From f93349cdae9ceb85bdf643f1ad97af9ccc30f2ad Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Wed, 19 Jul 2017 09:48:26 +0200 Subject: Disable blocking warnings new in OCaml 4.05.0 Gbp-Pq: Name 0006-Disable-blocking-warnings-new-in-OCaml-4.05.0.patch --- OMakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OMakefile b/OMakefile index c5b6a4e..4d15909 100644 --- a/OMakefile +++ b/OMakefile @@ -1,7 +1,7 @@ include config.omake -OCAMLFLAGS += -dtypes -w +a-3-4-27-50-k +OCAMLFLAGS += -dtypes -w +a-3-4-27-50-52-60-k .SUBDIRS: src doc -- cgit v1.2.3 From 030654efe2b587fb1b3b9a6e2f22d2f6d53af76d Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Wed, 19 Jul 2017 09:58:29 +0200 Subject: Use "include module type of" to avoid FTBFS with OCaml 4.05.0 Gbp-Pq: Name 0007-Use-include-module-type-of-to-avoid-FTBFS-with-OCaml.patch --- src/base/types.mli | 105 ++--------------------------------------------------- 1 file changed, 3 insertions(+), 102 deletions(-) diff --git a/src/base/types.mli b/src/base/types.mli index c5be9d9..f5e661c 100644 --- a/src/base/types.mli +++ b/src/base/types.mli @@ -294,38 +294,7 @@ end module Int32 : sig - val zero : int32 - val one : int32 - val minus_one : int32 - external neg : int32 -> int32 = "%int32_neg" - external add : int32 -> int32 -> int32 = "%int32_add" - external sub : int32 -> int32 -> int32 = "%int32_sub" - external mul : int32 -> int32 -> int32 = "%int32_mul" - external div : int32 -> int32 -> int32 = "%int32_div" - external rem : int32 -> int32 -> int32 = "%int32_mod" - val succ : int32 -> int32 - val pred : int32 -> int32 - val abs : int32 -> int32 - val max_int : int32 - val min_int : int32 - external logand : int32 -> int32 -> int32 = "%int32_and" - external logor : int32 -> int32 -> int32 = "%int32_or" - external logxor : int32 -> int32 -> int32 = "%int32_xor" - val lognot : int32 -> int32 - external shift_left : int32 -> int -> int32 = "%int32_lsl" - external shift_right : int32 -> int -> int32 = "%int32_asr" - external shift_right_logical : int32 -> int -> int32 = "%int32_lsr" - external of_int : int -> int32 = "%int32_of_int" - external to_int : int32 -> int = "%int32_to_int" - external of_float : float -> int32 = "caml_int32_of_float" - external to_float : int32 -> float = "caml_int32_to_float" - external of_string : string -> int32 = "caml_int32_of_string" - val to_string : int32 -> string - external bits_of_float : float -> int32 = "caml_int32_bits_of_float" - external float_of_bits : int32 -> float = "caml_int32_float_of_bits" - type t = int32 - val compare : t -> t -> int - external format : string -> int32 -> string = "caml_int32_format" + include module type of Int32 val equal : t -> t -> bool val hash : 'a -> int val gen : ?size:'a -> Random.State.t -> Int32.t @@ -333,42 +302,7 @@ end module Int64 : sig - val zero : int64 - val one : int64 - val minus_one : int64 - external neg : int64 -> int64 = "%int64_neg" - external add : int64 -> int64 -> int64 = "%int64_add" - external sub : int64 -> int64 -> int64 = "%int64_sub" - external mul : int64 -> int64 -> int64 = "%int64_mul" - external div : int64 -> int64 -> int64 = "%int64_div" - external rem : int64 -> int64 -> int64 = "%int64_mod" - val succ : int64 -> int64 - val pred : int64 -> int64 - val abs : int64 -> int64 - val max_int : int64 - val min_int : int64 - external logand : int64 -> int64 -> int64 = "%int64_and" - external logor : int64 -> int64 -> int64 = "%int64_or" - external logxor : int64 -> int64 -> int64 = "%int64_xor" - val lognot : int64 -> int64 - external shift_left : int64 -> int -> int64 = "%int64_lsl" - external shift_right : int64 -> int -> int64 = "%int64_asr" - external shift_right_logical : int64 -> int -> int64 = "%int64_lsr" - external of_int : int -> int64 = "%int64_of_int" - external to_int : int64 -> int = "%int64_to_int" - external of_float : float -> int64 = "caml_int64_of_float" - external to_float : int64 -> float = "caml_int64_to_float" - external of_int32 : int32 -> int64 = "%int64_of_int32" - external to_int32 : int64 -> int32 = "%int64_to_int32" - external of_nativeint : nativeint -> int64 = "%int64_of_nativeint" - external to_nativeint : int64 -> nativeint = "%int64_to_nativeint" - external of_string : string -> int64 = "caml_int64_of_string" - val to_string : int64 -> string - external bits_of_float : float -> int64 = "caml_int64_bits_of_float" - external float_of_bits : int64 -> float = "caml_int64_float_of_bits" - type t = int64 - val compare : t -> t -> int - external format : string -> int64 -> string = "caml_int64_format" + include module type of Int64 val equal : t -> t -> bool val hash : 'a -> int val gen : ?size:'a -> Random.State.t -> Int64.t @@ -376,40 +310,7 @@ end module Nativeint : sig - val zero : nativeint - val one : nativeint - val minus_one : nativeint - external neg : nativeint -> nativeint = "%nativeint_neg" - external add : nativeint -> nativeint -> nativeint = "%nativeint_add" - external sub : nativeint -> nativeint -> nativeint = "%nativeint_sub" - external mul : nativeint -> nativeint -> nativeint = "%nativeint_mul" - external div : nativeint -> nativeint -> nativeint = "%nativeint_div" - external rem : nativeint -> nativeint -> nativeint = "%nativeint_mod" - val succ : nativeint -> nativeint - val pred : nativeint -> nativeint - val abs : nativeint -> nativeint - val size : int - val max_int : nativeint - val min_int : nativeint - external logand : nativeint -> nativeint -> nativeint = "%nativeint_and" - external logor : nativeint -> nativeint -> nativeint = "%nativeint_or" - external logxor : nativeint -> nativeint -> nativeint = "%nativeint_xor" - val lognot : nativeint -> nativeint - external shift_left : nativeint -> int -> nativeint = "%nativeint_lsl" - external shift_right : nativeint -> int -> nativeint = "%nativeint_asr" - external shift_right_logical : nativeint -> int -> nativeint - = "%nativeint_lsr" - external of_int : int -> nativeint = "%nativeint_of_int" - external to_int : nativeint -> int = "%nativeint_to_int" - external of_float : float -> nativeint = "caml_nativeint_of_float" - external to_float : nativeint -> float = "caml_nativeint_to_float" - external of_int32 : int32 -> nativeint = "%nativeint_of_int32" - external to_int32 : nativeint -> int32 = "%nativeint_to_int32" - external of_string : string -> nativeint = "caml_nativeint_of_string" - val to_string : nativeint -> string - type t = nativeint - val compare : t -> t -> int - external format : string -> nativeint -> string = "caml_nativeint_format" + include module type of Nativeint val equal : t -> t -> bool val hash : 'a -> int val gen : ?size:'a -> Random.State.t -> Nativeint.t -- cgit v1.2.3 From 3949d1d460dddcc25ffc2b78f09baa0cab3f65ba Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Sat, 7 Sep 2019 20:00:09 +0200 Subject: Fix compilation with OCaml 4.08.0 Gbp-Pq: Name 0008-Fix-compilation-with-OCaml-4.08.0.patch --- OMakefile | 2 +- src/base/types.ml | 2 +- src/base/types.mli | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OMakefile b/OMakefile index 4d15909..74c1f83 100644 --- a/OMakefile +++ b/OMakefile @@ -1,7 +1,7 @@ include config.omake -OCAMLFLAGS += -dtypes -w +a-3-4-27-50-52-60-k +OCAMLFLAGS += -dtypes -w +a-3-4-27-44-50-52-60-k .SUBDIRS: src doc diff --git a/src/base/types.ml b/src/base/types.ml index 0fea396..c080c97 100644 --- a/src/base/types.ml +++ b/src/base/types.ml @@ -380,7 +380,7 @@ module String = struct for i = 0 to (len-1) do s.[i] <- Char.gen ~size:size rs done; - s + Bytes.to_string s let to_string x = x end diff --git a/src/base/types.mli b/src/base/types.mli index f5e661c..b20a0d2 100644 --- a/src/base/types.mli +++ b/src/base/types.mli @@ -360,7 +360,7 @@ sig val big_int_of_nat : Nat.nat -> big_int val base_power_big_int : int -> int -> big_int -> big_int val sys_big_int_of_string : string -> int -> int -> big_int - val round_futur_last_digit : string -> int -> int -> bool + val round_futur_last_digit : bytes -> int -> int -> bool val approx_big_int : int -> big_int -> string type t = big_int val equal : big_int -> big_int -> bool @@ -485,13 +485,13 @@ module String : sig external length : string -> int = "%string_length" external get : string -> int -> char = "%string_safe_get" - external set : string -> int -> char -> unit = "%string_safe_set" - external create : int -> string = "caml_create_string" + external set : bytes -> int -> char -> unit = "%string_safe_set" + external create : int -> bytes = "caml_create_string" val make : int -> char -> string val copy : string -> string val sub : string -> int -> int -> string - val fill : string -> int -> int -> char -> unit - val blit : string -> int -> string -> int -> int -> unit + val fill : bytes -> int -> int -> char -> unit + val blit : string -> int -> bytes -> int -> int -> unit val concat : string -> string list -> string val iter : (char -> unit) -> string -> unit val escaped : string -> string @@ -509,11 +509,11 @@ sig type t = string val compare : t -> t -> int external unsafe_get : string -> int -> char = "%string_unsafe_get" - external unsafe_set : string -> int -> char -> unit + external unsafe_set : bytes -> int -> char -> unit = "%string_unsafe_set" - external unsafe_blit : string -> int -> string -> int -> int -> unit + external unsafe_blit : string -> int -> bytes -> int -> int -> unit = "caml_blit_string" "noalloc" - external unsafe_fill : string -> int -> int -> char -> unit + external unsafe_fill : bytes -> int -> int -> char -> unit = "caml_fill_string" "noalloc" val equal : t -> t -> bool val hash : 'a -> int -- cgit v1.2.3 From 805df4afa70aa8b8d55ecd8f1201ccfdb70e3577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Glondu?= Date: Mon, 6 Feb 2023 13:58:54 +0100 Subject: Define OCAMLDEP_MODULES (Closes: #971176) Gbp-Pq: Name 0009-Define-OCAMLDEP_MODULES-Closes-971176.patch --- config.omake | 1 + 1 file changed, 1 insertion(+) diff --git a/config.omake b/config.omake index 7a35fc2..dee3d0a 100644 --- a/config.omake +++ b/config.omake @@ -6,6 +6,7 @@ static. = eprintln(ocaml-findlib is required to build this project) exit 1 OCAMLDEP_MODULES_ENABLED = $(OCAMLDEP_MODULES_AVAILABLE) + OCAMLDEP_MODULES = ocamldep -modules OCAMLDEP=$(OCAMLDEP_MODULES) if $(not $(defined PREFIX)) PREFIX=$(shell ocamlc -where) -- cgit v1.2.3 From e8d703fba94d65905c89eab6f1534de4b8cd14c1 Mon Sep 17 00:00:00 2001 From: Mike Furr Date: Sat, 4 Jul 2009 14:48:29 +0200 Subject: Fix PREFIX handling Gbp-Pq: Name 0001-Fix-PREFIX-handling.patch --- config.omake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config.omake b/config.omake index 4417254..7a35fc2 100644 --- a/config.omake +++ b/config.omake @@ -7,7 +7,12 @@ static. = exit 1 OCAMLDEP_MODULES_ENABLED = $(OCAMLDEP_MODULES_AVAILABLE) OCAMLDEP=$(OCAMLDEP_MODULES) - PREFIX=$(shell ocamlc -where) + if $(not $(defined PREFIX)) + PREFIX=$(shell ocamlc -where) + export + if $(defined-env OCAMLFIND_DESTDIR) + PREFIX = $(getenv OCAMLFIND_DESTDIR) + export VERSION=0.1a ConfMsgChecking(oUnit) OUNIT_DIR=$(shell ocamlfind query oUnit) -- cgit v1.2.3 From 619f3a813ec35e0c3f6f1ac9751c33b56607666f Mon Sep 17 00:00:00 2001 From: Mike Furr Date: Sat, 4 Jul 2009 14:48:41 +0200 Subject: Install cmi Gbp-Pq: Name 0002-Install-cmi.patch --- src/OMakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OMakefile b/src/OMakefile index 983799d..e85608c 100644 --- a/src/OMakefile +++ b/src/OMakefile @@ -52,5 +52,5 @@ REINS_CMX=$(if $(NATIVE_ENABLED), reins.cmx) install: META $(REINS_LIB) mkdir -p $(PREFIX)/reins - ocamlfind install reins META $(REINS_LIB) $(REINS_CMX) \ + ocamlfind install reins META $(REINS_LIB) $(REINS_CMX) reins.cmi \ $(filter-exists $(addsuffix .mli, $(FILES))) -- cgit v1.2.3 From 82d6db840cced66a28b27c99721f702598ce96d2 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Thu, 30 Jan 2014 14:39:23 +0100 Subject: Fix test-suite with new oUnit This is a part of https://github.com/ocaml/opam-repository/blob/master/packages/reins/reins.0.1a/files/fix_build.patch Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713499 Gbp-Pq: Name 0003-Fix-test-suite-with-new-oUnit.patch --- test/unit/OMakefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/unit/OMakefile b/test/unit/OMakefile index 565c83d..4ec66c9 100644 --- a/test/unit/OMakefile +++ b/test/unit/OMakefile @@ -1,9 +1,8 @@ TESTDIRS = list heap set map -OCAMLINCLUDES += \ - $(shell $(OCAMLFIND) query oUnit) \ - $(ROOT)/src +OCAMLPACKS [] = oUnit num +OCAMLINCLUDES += $(ROOT)/src FILES[] = test_helper @@ -17,7 +16,6 @@ FILES[] = OCAMLINCLUDES += $(TESTDIRS) OCAML_LIBS = $(ROOT)/src/reins -OCAML_OTHER_LIBS += str nums unix oUnit TEST_PROGRAM = $(OCamlProgram run_unit_tests, $(FILES)) unit_tests.results: $(TEST_PROGRAM) -- cgit v1.2.3 From ef5c3304783c62782eeba73a21d5988f5a754217 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Thu, 30 Jan 2014 14:54:58 +0100 Subject: Fix version in META This is a part of https://github.com/ocaml/opam-repository/blob/master/packages/reins/reins.0.1a/files/fix_build.patch Gbp-Pq: Name 0004-Fix-version-in-META.patch --- src/META.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/META.in b/src/META.in index 6cbc725..cbdb0a3 100644 --- a/src/META.in +++ b/src/META.in @@ -1,3 +1,3 @@ -version="0.1" +version="0.1a" archive(byte)="reins.cma" -archive(native)="reins.cmxa" \ No newline at end of file +archive(native)="reins.cmxa" -- cgit v1.2.3 From 89a2f81c6eb6b9519a2eb0593b483577f87b7b06 Mon Sep 17 00:00:00 2001 From: Mehdi Dogguy Date: Fri, 16 Oct 2015 22:45:57 +0200 Subject: Fix FTBFS with OCaml 4.02.3 Gbp-Pq: Name 0005-Fix-FTBFS-with-OCaml-4.02.3.patch --- OMakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OMakefile b/OMakefile index b741412..c5b6a4e 100644 --- a/OMakefile +++ b/OMakefile @@ -1,7 +1,7 @@ include config.omake -OCAMLFLAGS += -dtypes +OCAMLFLAGS += -dtypes -w +a-3-4-27-50-k .SUBDIRS: src doc -- cgit v1.2.3 From 949f9933a24864aa54714b0f1f82e2b0947df668 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Wed, 19 Jul 2017 09:48:26 +0200 Subject: Disable blocking warnings new in OCaml 4.05.0 Gbp-Pq: Name 0006-Disable-blocking-warnings-new-in-OCaml-4.05.0.patch --- OMakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OMakefile b/OMakefile index c5b6a4e..4d15909 100644 --- a/OMakefile +++ b/OMakefile @@ -1,7 +1,7 @@ include config.omake -OCAMLFLAGS += -dtypes -w +a-3-4-27-50-k +OCAMLFLAGS += -dtypes -w +a-3-4-27-50-52-60-k .SUBDIRS: src doc -- cgit v1.2.3 From 87a42f040dca154078cb40a7e6feaf20f0b827e1 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Wed, 19 Jul 2017 09:58:29 +0200 Subject: Use "include module type of" to avoid FTBFS with OCaml 4.05.0 Gbp-Pq: Name 0007-Use-include-module-type-of-to-avoid-FTBFS-with-OCaml.patch --- src/base/types.mli | 105 ++--------------------------------------------------- 1 file changed, 3 insertions(+), 102 deletions(-) diff --git a/src/base/types.mli b/src/base/types.mli index c5be9d9..f5e661c 100644 --- a/src/base/types.mli +++ b/src/base/types.mli @@ -294,38 +294,7 @@ end module Int32 : sig - val zero : int32 - val one : int32 - val minus_one : int32 - external neg : int32 -> int32 = "%int32_neg" - external add : int32 -> int32 -> int32 = "%int32_add" - external sub : int32 -> int32 -> int32 = "%int32_sub" - external mul : int32 -> int32 -> int32 = "%int32_mul" - external div : int32 -> int32 -> int32 = "%int32_div" - external rem : int32 -> int32 -> int32 = "%int32_mod" - val succ : int32 -> int32 - val pred : int32 -> int32 - val abs : int32 -> int32 - val max_int : int32 - val min_int : int32 - external logand : int32 -> int32 -> int32 = "%int32_and" - external logor : int32 -> int32 -> int32 = "%int32_or" - external logxor : int32 -> int32 -> int32 = "%int32_xor" - val lognot : int32 -> int32 - external shift_left : int32 -> int -> int32 = "%int32_lsl" - external shift_right : int32 -> int -> int32 = "%int32_asr" - external shift_right_logical : int32 -> int -> int32 = "%int32_lsr" - external of_int : int -> int32 = "%int32_of_int" - external to_int : int32 -> int = "%int32_to_int" - external of_float : float -> int32 = "caml_int32_of_float" - external to_float : int32 -> float = "caml_int32_to_float" - external of_string : string -> int32 = "caml_int32_of_string" - val to_string : int32 -> string - external bits_of_float : float -> int32 = "caml_int32_bits_of_float" - external float_of_bits : int32 -> float = "caml_int32_float_of_bits" - type t = int32 - val compare : t -> t -> int - external format : string -> int32 -> string = "caml_int32_format" + include module type of Int32 val equal : t -> t -> bool val hash : 'a -> int val gen : ?size:'a -> Random.State.t -> Int32.t @@ -333,42 +302,7 @@ end module Int64 : sig - val zero : int64 - val one : int64 - val minus_one : int64 - external neg : int64 -> int64 = "%int64_neg" - external add : int64 -> int64 -> int64 = "%int64_add" - external sub : int64 -> int64 -> int64 = "%int64_sub" - external mul : int64 -> int64 -> int64 = "%int64_mul" - external div : int64 -> int64 -> int64 = "%int64_div" - external rem : int64 -> int64 -> int64 = "%int64_mod" - val succ : int64 -> int64 - val pred : int64 -> int64 - val abs : int64 -> int64 - val max_int : int64 - val min_int : int64 - external logand : int64 -> int64 -> int64 = "%int64_and" - external logor : int64 -> int64 -> int64 = "%int64_or" - external logxor : int64 -> int64 -> int64 = "%int64_xor" - val lognot : int64 -> int64 - external shift_left : int64 -> int -> int64 = "%int64_lsl" - external shift_right : int64 -> int -> int64 = "%int64_asr" - external shift_right_logical : int64 -> int -> int64 = "%int64_lsr" - external of_int : int -> int64 = "%int64_of_int" - external to_int : int64 -> int = "%int64_to_int" - external of_float : float -> int64 = "caml_int64_of_float" - external to_float : int64 -> float = "caml_int64_to_float" - external of_int32 : int32 -> int64 = "%int64_of_int32" - external to_int32 : int64 -> int32 = "%int64_to_int32" - external of_nativeint : nativeint -> int64 = "%int64_of_nativeint" - external to_nativeint : int64 -> nativeint = "%int64_to_nativeint" - external of_string : string -> int64 = "caml_int64_of_string" - val to_string : int64 -> string - external bits_of_float : float -> int64 = "caml_int64_bits_of_float" - external float_of_bits : int64 -> float = "caml_int64_float_of_bits" - type t = int64 - val compare : t -> t -> int - external format : string -> int64 -> string = "caml_int64_format" + include module type of Int64 val equal : t -> t -> bool val hash : 'a -> int val gen : ?size:'a -> Random.State.t -> Int64.t @@ -376,40 +310,7 @@ end module Nativeint : sig - val zero : nativeint - val one : nativeint - val minus_one : nativeint - external neg : nativeint -> nativeint = "%nativeint_neg" - external add : nativeint -> nativeint -> nativeint = "%nativeint_add" - external sub : nativeint -> nativeint -> nativeint = "%nativeint_sub" - external mul : nativeint -> nativeint -> nativeint = "%nativeint_mul" - external div : nativeint -> nativeint -> nativeint = "%nativeint_div" - external rem : nativeint -> nativeint -> nativeint = "%nativeint_mod" - val succ : nativeint -> nativeint - val pred : nativeint -> nativeint - val abs : nativeint -> nativeint - val size : int - val max_int : nativeint - val min_int : nativeint - external logand : nativeint -> nativeint -> nativeint = "%nativeint_and" - external logor : nativeint -> nativeint -> nativeint = "%nativeint_or" - external logxor : nativeint -> nativeint -> nativeint = "%nativeint_xor" - val lognot : nativeint -> nativeint - external shift_left : nativeint -> int -> nativeint = "%nativeint_lsl" - external shift_right : nativeint -> int -> nativeint = "%nativeint_asr" - external shift_right_logical : nativeint -> int -> nativeint - = "%nativeint_lsr" - external of_int : int -> nativeint = "%nativeint_of_int" - external to_int : nativeint -> int = "%nativeint_to_int" - external of_float : float -> nativeint = "caml_nativeint_of_float" - external to_float : nativeint -> float = "caml_nativeint_to_float" - external of_int32 : int32 -> nativeint = "%nativeint_of_int32" - external to_int32 : nativeint -> int32 = "%nativeint_to_int32" - external of_string : string -> nativeint = "caml_nativeint_of_string" - val to_string : nativeint -> string - type t = nativeint - val compare : t -> t -> int - external format : string -> nativeint -> string = "caml_nativeint_format" + include module type of Nativeint val equal : t -> t -> bool val hash : 'a -> int val gen : ?size:'a -> Random.State.t -> Nativeint.t -- cgit v1.2.3 From 8f36a98cfbc975eab734b40da13574dd0b955490 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Sat, 7 Sep 2019 20:00:09 +0200 Subject: Fix compilation with OCaml 4.08.0 Gbp-Pq: Name 0008-Fix-compilation-with-OCaml-4.08.0.patch --- OMakefile | 2 +- src/base/types.ml | 2 +- src/base/types.mli | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OMakefile b/OMakefile index 4d15909..74c1f83 100644 --- a/OMakefile +++ b/OMakefile @@ -1,7 +1,7 @@ include config.omake -OCAMLFLAGS += -dtypes -w +a-3-4-27-50-52-60-k +OCAMLFLAGS += -dtypes -w +a-3-4-27-44-50-52-60-k .SUBDIRS: src doc diff --git a/src/base/types.ml b/src/base/types.ml index 0fea396..c080c97 100644 --- a/src/base/types.ml +++ b/src/base/types.ml @@ -380,7 +380,7 @@ module String = struct for i = 0 to (len-1) do s.[i] <- Char.gen ~size:size rs done; - s + Bytes.to_string s let to_string x = x end diff --git a/src/base/types.mli b/src/base/types.mli index f5e661c..b20a0d2 100644 --- a/src/base/types.mli +++ b/src/base/types.mli @@ -360,7 +360,7 @@ sig val big_int_of_nat : Nat.nat -> big_int val base_power_big_int : int -> int -> big_int -> big_int val sys_big_int_of_string : string -> int -> int -> big_int - val round_futur_last_digit : string -> int -> int -> bool + val round_futur_last_digit : bytes -> int -> int -> bool val approx_big_int : int -> big_int -> string type t = big_int val equal : big_int -> big_int -> bool @@ -485,13 +485,13 @@ module String : sig external length : string -> int = "%string_length" external get : string -> int -> char = "%string_safe_get" - external set : string -> int -> char -> unit = "%string_safe_set" - external create : int -> string = "caml_create_string" + external set : bytes -> int -> char -> unit = "%string_safe_set" + external create : int -> bytes = "caml_create_string" val make : int -> char -> string val copy : string -> string val sub : string -> int -> int -> string - val fill : string -> int -> int -> char -> unit - val blit : string -> int -> string -> int -> int -> unit + val fill : bytes -> int -> int -> char -> unit + val blit : string -> int -> bytes -> int -> int -> unit val concat : string -> string list -> string val iter : (char -> unit) -> string -> unit val escaped : string -> string @@ -509,11 +509,11 @@ sig type t = string val compare : t -> t -> int external unsafe_get : string -> int -> char = "%string_unsafe_get" - external unsafe_set : string -> int -> char -> unit + external unsafe_set : bytes -> int -> char -> unit = "%string_unsafe_set" - external unsafe_blit : string -> int -> string -> int -> int -> unit + external unsafe_blit : string -> int -> bytes -> int -> int -> unit = "caml_blit_string" "noalloc" - external unsafe_fill : string -> int -> int -> char -> unit + external unsafe_fill : bytes -> int -> int -> char -> unit = "caml_fill_string" "noalloc" val equal : t -> t -> bool val hash : 'a -> int -- cgit v1.2.3 From df2c8f9e32729b3a2beba57b998124b55c317842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Glondu?= Date: Mon, 6 Feb 2023 13:58:54 +0100 Subject: Define OCAMLDEP_MODULES (Closes: #971176) Gbp-Pq: Name 0009-Define-OCAMLDEP_MODULES-Closes-971176.patch --- config.omake | 1 + 1 file changed, 1 insertion(+) diff --git a/config.omake b/config.omake index 7a35fc2..dee3d0a 100644 --- a/config.omake +++ b/config.omake @@ -6,6 +6,7 @@ static. = eprintln(ocaml-findlib is required to build this project) exit 1 OCAMLDEP_MODULES_ENABLED = $(OCAMLDEP_MODULES_AVAILABLE) + OCAMLDEP_MODULES = ocamldep -modules OCAMLDEP=$(OCAMLDEP_MODULES) if $(not $(defined PREFIX)) PREFIX=$(shell ocamlc -where) -- cgit v1.2.3