[Pkg-ocaml-maint-commits] [ocaml-reins] 03/06: Use "include module type of" to avoid FTBFS with OCaml 4.05.0

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocaml-reins.

commit 99537bcfa06791777af4550e5794279967031e04
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jul 19 09:58:55 2017 +0200

    Use "include module type of" to avoid FTBFS with OCaml 4.05.0
---
 ...-module-type-of-to-avoid-FTBFS-with-OCaml.patch | 138 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 2 files changed, 139 insertions(+)

diff --git a/debian/patches/0007-Use-include-module-type-of-to-avoid-FTBFS-with-OCaml.patch b/debian/patches/0007-Use-include-module-type-of-to-avoid-FTBFS-with-OCaml.patch
new file mode 100644
index 0000000..3ba68d8
--- /dev/null
+++ b/debian/patches/0007-Use-include-module-type-of-to-avoid-FTBFS-with-OCaml.patch
@@ -0,0 +1,138 @@
+From: Stephane Glondu <steph at glondu.net>
+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/debian/patches/series b/debian/patches/series
index c01ce6a..b963721 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-reins.git