This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository frama-c.
commit cef5338cda459f3eb7aab6cb05d204503a51550e Author: Stephane Glondu <st...@glondu.net> Date: Thu Jul 27 19:01:27 2017 +0200 Fix FTBFS with OCaml 4.05.0 --- .../patches/0007-Fix-FTBFS-with-OCaml-4.05.0.patch | 85 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 86 insertions(+) diff --git a/debian/patches/0007-Fix-FTBFS-with-OCaml-4.05.0.patch b/debian/patches/0007-Fix-FTBFS-with-OCaml-4.05.0.patch new file mode 100644 index 0000000..62792b3 --- /dev/null +++ b/debian/patches/0007-Fix-FTBFS-with-OCaml-4.05.0.patch @@ -0,0 +1,85 @@ +From: Stephane Glondu <st...@glondu.net> +Date: Thu, 27 Jul 2017 19:00:45 +0200 +Subject: Fix FTBFS with OCaml 4.05.0 + +--- + src/kernel_services/analysis/dataflow.ml | 2 +- + src/kernel_services/analysis/dataflow2.ml | 2 +- + src/libraries/project/state_builder.ml | 1 + + src/libraries/utils/hook.ml | 4 ++-- + src/plugins/wp/qed/src/idxset.ml | 2 +- + 5 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/src/kernel_services/analysis/dataflow.ml b/src/kernel_services/analysis/dataflow.ml +index 0f32f24..137dd2c 100644 +--- a/src/kernel_services/analysis/dataflow.ml ++++ b/src/kernel_services/analysis/dataflow.ml +@@ -80,7 +80,7 @@ module type StmtStartData = sig + val length: unit -> int + end + +-module StartData(X: sig type t val size: int end) = struct ++module StartData(X: sig type t val size: int end) : StmtStartData with type data = X.t = struct + type data = X.t + open Cil_datatype.Stmt.Hashtbl + let stmtStartData = create X.size +diff --git a/src/kernel_services/analysis/dataflow2.ml b/src/kernel_services/analysis/dataflow2.ml +index 0d6eb24..55c108e 100644 +--- a/src/kernel_services/analysis/dataflow2.ml ++++ b/src/kernel_services/analysis/dataflow2.ml +@@ -57,7 +57,7 @@ module type StmtStartData = sig + val length: unit -> int + end + +-module StartData(X: sig type t val size: int end) = struct ++module StartData(X: sig type t val size: int end) : StmtStartData with type data = X.t = struct + type data = X.t + open Cil_datatype.Stmt.Hashtbl + let stmtStartData = create X.size +diff --git a/src/libraries/project/state_builder.ml b/src/libraries/project/state_builder.ml +index 8d07c0d..2f65b81 100644 +--- a/src/libraries/project/state_builder.ml ++++ b/src/libraries/project/state_builder.ml +@@ -746,6 +746,7 @@ struct + let mem = HW.mem + let find_all = HW.find_all + let find = HW.find ++ let find_opt _ _ = assert false + let remove = HW.remove + let add h v = HW.replace h v v + +diff --git a/src/libraries/utils/hook.ml b/src/libraries/utils/hook.ml +index 7c4e762..7db08ae 100644 +--- a/src/libraries/utils/hook.ml ++++ b/src/libraries/utils/hook.ml +@@ -54,7 +54,7 @@ let add_once v queue = + let already = Queue.fold (fun b v' -> b || v' == v) false queue in + if not already then Queue.add v queue + +-module Build(P:sig type t end) = struct ++module Build(P:sig type t end) : Iter_hook with type param = P.t = struct + type param = P.t + type result = unit + let hooks = Queue.create () +@@ -74,7 +74,7 @@ module Build(P:sig type t end) = struct + let length () = Queue.length hooks + end + +-module Fold(P:sig type t end) = struct ++module Fold(P:sig type t end) : S with type param = P.t and type result = P.t = struct + type param = P.t + type result = P.t + let hooks = Queue.create () +diff --git a/src/plugins/wp/qed/src/idxset.ml b/src/plugins/wp/qed/src/idxset.ml +index 941384b..037d0b4 100644 +--- a/src/plugins/wp/qed/src/idxset.ml ++++ b/src/plugins/wp/qed/src/idxset.ml +@@ -56,7 +56,7 @@ sig + val id : t -> int (* unique per t *) + end + +-module Make(E : IndexedElements) = ++module Make(E : IndexedElements) : S with type elt = E.t = + struct + type t = E.t Intmap.t + type elt = E.t diff --git a/debian/patches/series b/debian/patches/series index d83414e..53afd62 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 0004-Use-ocamlfind-package-lablgtk2-gnome.gnomecanvas.patch 0005-Value.cmo-needs-LoopAnalysis.cmo.patch 0006-gui.byte-needs-TARGETS_GUI_BYTE-only.patch +0007-Fix-FTBFS-with-OCaml-4.05.0.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/frama-c.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits