Fix fatal warnings

3 files changed, 74 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1894f528d324..6effd44bef32 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,23 @@
 pkgbase = tis-interpreter-git
 	pkgdesc = An interpreter for finding subtle bugs in programs written in standard C
-	pkgver = r47.e8de317
+	pkgver = r95.33132ce
 	pkgrel = 1
 	url = https://github.com/TrustInSoft/tis-interpreter
 	arch = i686
 	arch = x86_64
 	license = LGPL2.1
 	makedepends = git
-	depends = ocaml
-	depends = ocaml-findlib
-	depends = zarith
-	depends = ocaml-easy-format
-	depends = ocaml-biniou
-	depends = ocaml-yojson
+	makedepends = ocaml
+	makedepends = ocaml-findlib
+	makedepends = zarith
+	makedepends = ocaml-easy-format
+	makedepends = ocaml-biniou
+	makedepends = ocaml-yojson
 	provides = tis-interpreter
 	conflicts = tis-interpreter
+	source = frama-c-ocaml-4-04.patch
 	source = git+https://github.com/TrustInSoft/tis-interpreter
+	sha256sums = b6f7c77da046b558328c901a9e176c6d4ee361aa11eb8e6cc87971290c6b2525
 	sha256sums = SKIP
 
 pkgname = tis-interpreter-git
diff --git a/PKGBUILD b/PKGBUILD
index 1fb202911ccb..1c927066ae8d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,18 @@
 
 _pkgname=tis-interpreter
 pkgname=$_pkgname-git
-pkgver=r47.e8de317
+pkgver=r95.33132ce
 pkgrel=1
 pkgdesc="An interpreter for finding subtle bugs in programs written in standard C"
 arch=('i686' 'x86_64')
 url="https://github.com/TrustInSoft/tis-interpreter"
 license=('LGPL2.1')
-depends=('ocaml' 'ocaml-findlib' 'zarith' 'ocaml-easy-format' 'ocaml-biniou' 'ocaml-yojson')
-makedepends=('git')
+makedepends=('git' 'ocaml' 'ocaml-findlib' 'zarith' 'ocaml-easy-format' 'ocaml-biniou' 'ocaml-yojson')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-source=("git+https://github.com/TrustInSoft/$_pkgname")
-sha256sums=('SKIP')
+source=("frama-c-ocaml-4-04.patch" "git+https://github.com/TrustInSoft/$_pkgname")
+sha256sums=('b6f7c77da046b558328c901a9e176c6d4ee361aa11eb8e6cc87971290c6b2525'
+            'SKIP')
 
 pkgver() {
   cd "$_pkgname"
@@ -24,13 +24,14 @@ prepare() {
   cd "$_pkgname"
   sed -i 's#^ROOT_PATH=.*$#ROOT_PATH=/usr/share/tis-interpreter#' "tis-interpreter/tis-interpreter.sh"
   sed -i 's#^TIS_PATH=.*$#TIS_PATH=/usr#' "tis-interpreter/tis-interpreter.sh"
+  patch -p1 -i "$srcdir/frama-c-ocaml-4-04.patch"
 }
 
 build() {
   cd "$_pkgname"
   ./configure --prefix=/usr --disable-from_analysis --disable-gui --disable-impact --disable-inout --disable-metrics --disable-occurrence --disable-pdg --disable-postdominators --enable-rtegen --disable-scope --disable-slicing --disable-sparecode --enable-users --disable-aorai --disable-obfuscator --disable-report --disable-security_slicing --disable-wp --disable-wp-coq --disable-wp-why3 --disable-print_api --with-all-static
   make depend
-  make
+  make WARNINGS="-w @a-3-4-6-9-41-44-45-48-50-60"
 }
 
 package() {
diff --git a/frama-c-ocaml-4-04.patch b/frama-c-ocaml-4-04.patch
new file mode 100644
index 000000000000..f5f280b3b0f2
--- /dev/null
+++ b/frama-c-ocaml-4-04.patch
@@ -0,0 +1,58 @@
+diff -ur frama-c-Aluminium-20160501.old/src/kernel_services/plugin_entry_points/db.ml frama-c-Aluminium-20160501/src/kernel_services/plugin_entry_points/db.ml
+--- frama-c-Aluminium-20160501.old/src/kernel_services/plugin_entry_points/db.ml	2016-05-30 15:15:22.000000000 +0100
++++ frama-c-Aluminium-20160501/src/kernel_services/plugin_entry_points/db.ml	2016-11-08 14:08:20.571465782 +0000
+@@ -1071,9 +1071,12 @@
+           { state_opt: bool option;
+             ki_opt: (stmt * bool) option;
+             kf:Kernel_function.t }
+-      let mk_ctx_func_contrat = mk_fun "Interp.To_zone.mk_ctx_func_contrat"
+-      let mk_ctx_stmt_contrat = mk_fun "Interp.To_zone.mk_ctx_stmt_contrat"
+-      let mk_ctx_stmt_annot = mk_fun "Interp.To_zone.mk_ctx_stmt_annot"
++      let mk_ctx_func_contrat : (Cil_types.kernel_function -> state_opt:bool option -> t_ctx) ref
++        = mk_fun "Interp.To_zone.mk_ctx_func_contrat"
++      let mk_ctx_stmt_contrat : (Cil_types.kernel_function -> Cil_types.stmt -> state_opt:bool option -> t_ctx) ref
++        = mk_fun "Interp.To_zone.mk_ctx_stmt_contrat"
++      let mk_ctx_stmt_annot : (Cil_types.kernel_function -> Cil_types.stmt -> t_ctx) ref
++        = mk_fun "Interp.To_zone.mk_ctx_stmt_annot"
+       type t = {before:bool ; ki:stmt ; zone:Locations.Zone.t}
+       type t_zone_info = (t list) option
+       type t_decl =
+@@ -1082,15 +1085,29 @@
+       type t_pragmas =
+           { ctrl: Stmt.Set.t;
+             stmt: Stmt.Set.t }
+-      let from_term = mk_fun "Interp.To_zone.from_term"
+-      let from_terms= mk_fun "Interp.To_zone.from_terms"
+-      let from_pred = mk_fun "Interp.To_zone.from_pred"
+-      let from_preds= mk_fun "Interp.To_zone.from_preds"
+-      let from_zone = mk_fun "Interp.To_zone.from_zone"
+-      let from_stmt_annot= mk_fun "Interp.To_zone.from_stmt_annot"
+-      let from_stmt_annots= mk_fun "Interp.To_zone.from_stmt_annots"
+-      let from_func_annots= mk_fun "Interp.To_zone.from_func_annots"
+-      let code_annot_filter= mk_fun "Interp.To_zone.code_annot_filter"
++      let from_term : (Cil_types.term -> t_ctx -> t_zone_info * t_decl) ref
++        = mk_fun "Interp.To_zone.from_term"
++      let from_terms : (Cil_types.term list -> t_ctx -> t_zone_info * t_decl) ref
++        = mk_fun "Interp.To_zone.from_terms"
++      let from_pred : (Cil_types.predicate Cil_types.named -> t_ctx -> t_zone_info * t_decl) ref
++        = mk_fun "Interp.To_zone.from_pred"
++      let from_preds : (Cil_types.predicate Cil_types.named list -> t_ctx -> t_zone_info * t_decl) ref
++        = mk_fun "Interp.To_zone.from_preds"
++      let from_zone : (Cil_types.identified_term -> t_ctx -> t_zone_info * t_decl) ref
++        = mk_fun "Interp.To_zone.from_zone"
++      let from_stmt_annot : (Cil_types.code_annotation -> Cil_types.stmt * Cil_types.kernel_function -> (t_zone_info * t_decl) * t_pragmas) ref
++        = mk_fun "Interp.To_zone.from_stmt_annot"
++      let from_stmt_annots : ((Cil_types.code_annotation -> bool) option ->
++            Cil_types.stmt * Cil_types.kernel_function ->
++            (t_zone_info * t_decl) * t_pragmas)
++           ref
++        = mk_fun "Interp.To_zone.from_stmt_annots"
++      let from_func_annots : (((Cil_types.stmt -> unit) -> Cil_types.kernel_function -> unit) ->
++            (Cil_types.code_annotation -> bool) option ->
++            Cil_types.kernel_function -> (t_zone_info * t_decl) * t_pragmas)
++           ref
++        = mk_fun "Interp.To_zone.from_func_annots"
++      let code_annot_filter = mk_fun "Interp.To_zone.code_annot_filter"
+     end
+
+     let to_result_from_pred =