Control: tags -1 + patch
Le 26/12/2021 à 10:16, Stéphane Glondu a écrit :
> Your package FTBFS with OCaml 4.13.1 with the following error:
>> File "../../../customize/perl_edit.ml", line 30, characters 2-13:
>> 30 | c_edit_file (verbose ()) g (Guestfs.c_pointer g) file expr
>> ^^^^^^^^^^^
>> Error (warning 6 [labels-omitted]): label verbose was omitted in the
>> application of this function.
>> make[5]: *** [Makefile:3266: perl_edit.cmx] Error 2
Fix attached.
Cheers,
--
Stéphane
From 80abb37b53fc1297de7644ed5a3506c4c1f9375e Mon Sep 17 00:00:00 2001
From: Stephane Glondu <[email protected]>
Date: Sun, 26 Dec 2021 10:03:35 +0100
Subject: [PATCH] Do not error on warning 6 [labels-omitted]
---
debian/changelog | 7 +++++++
m4/guestfs-ocaml.m4 | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 31c5b26..5c96ae0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libguestfs (1:1.44.2-1.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Do not error on OCaml warning 6 [labels-omitted] (Closes: #1002634)
+
+ -- Stéphane Glondu <[email protected]> Sun, 26 Dec 2021 10:19:53 +0100
+
libguestfs (1:1.44.2-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4
index bf07799..c40a173 100644
--- a/m4/guestfs-ocaml.m4
+++ b/m4/guestfs-ocaml.m4
@@ -231,7 +231,7 @@ EOF
])
dnl Flags we want to pass to every OCaml compiler call.
-OCAML_WARN_ERROR="-warn-error CDEFLMPSUVYZX+52-3"
+OCAML_WARN_ERROR="-warn-error +C+D+E+F+L+M+P+S+U+V+Y+Z+X+52-3-6"
AC_SUBST([OCAML_WARN_ERROR])
OCAML_FLAGS="-g -annot $safe_string_option"
AC_SUBST([OCAML_FLAGS])
--
2.34.1
