Control: tags -1 + patch On Tuesday, February 01 2022, Matthias Klose wrote:
> guestfs-tools ftbfs with new ocaml > > [...] > Use the equivalent signed form: +C+D+E+F+L+M+P+S+U+V+Y+Z+X+52-3. > Hint: Enabling or disabling a warning by its mnemonic name requires a + or - > prefix. > Hint: Did you make a spelling mistake when using a mnemonic name? > File "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[4]: *** [Makefile:1806: perl_edit.cmx] Error 2 > make[4]: *** Waiting for unfinished jobs.... > touch stamp-virt-customize.pod > make[4]: Leaving directory '/packages/tmp/guestfs-tools-1.46.1/customize' > make[3]: *** [Makefile:939: all] Error 2 > make[3]: Leaving directory '/packages/tmp/guestfs-tools-1.46.1/customize' > make[2]: *** [Makefile:855: all-recursive] Error 1 > make[2]: Leaving directory '/packages/tmp/guestfs-tools-1.46.1' > make[1]: *** [Makefile:769: all] Error 2 > make[1]: Leaving directory '/packages/tmp/guestfs-tools-1.46.1' > dh_auto_build: error: make -j64 returned exit code 2 > make: *** [debian/rules:19: binary-arch] Error 25 Upstream already has a fix: https://github.com/rwmjones/guestfs-tools/commit/577f7aee4b1c720f4c4826115b49a0c3870b149e The following debdiff should fix it on Debian (feel free to remove/rewrite the changelog entry). Thanks, -- Sergio GPG key ID: 237A 54B1 0287 28BF 00EF 31F4 D0EB 7628 65FC 5E36 Please send encrypted e-mail if possible https://sergiodj.net/ diff --git a/debian/changelog b/debian/changelog index a849c22..67427d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +guestfs-tools (1.46.1-5) UNRELEASED; urgency=medium + + [ Hilko Bengen ] + * Run tests on more architectures: ppc64el, s390x + + [ Sergio Durigan Junior ] + * d/p/Disable-OCaml-warning-6-completely.patch: + Disable OCaml warning 6 completely, fixing FTBFS with new ocaml. + (Closes: #1004748) + + -- Sergio Durigan Junior <[email protected]> Thu, 03 Feb 2022 14:14:11 -0500 + guestfs-tools (1.46.1-4) unstable; urgency=medium * Add missing build-dependencies diff --git a/debian/patches/Disable-OCaml-warning-6-completely.patch b/debian/patches/Disable-OCaml-warning-6-completely.patch new file mode 100644 index 0000000..0c0e427 --- /dev/null +++ b/debian/patches/Disable-OCaml-warning-6-completely.patch @@ -0,0 +1,41 @@ +From: "Richard W.M. Jones" <[email protected]> +Date: Fri, 10 Dec 2021 10:20:34 +0000 +Subject: Disable OCaml warning 6 completely + +Warning 6 "labels-omitted" is not useful. It's fine to omit labels on +positional arguments. + +Example: + + File "perl_edit.ml", line 30, characters 2-13: + 30 | c_edit_file (verbose ()) g (Guestfs.c_pointer g) file expr + ^^^^^^^^^^^ + Warning 6 [labels-omitted]: label verbose was omitted in the application of this function. + +The function is specified as: + + external c_edit_file : verbose:bool -> Guestfs.t -> int64 -> string -> string -> unit + +The complaint is that the verbose: label has been omitted from the +first argument when the function is called, but IMO this is a +stylistic thing, not a bug. + +Origin: backport, https://github.com/rwmjones/guestfs-tools/commit/577f7aee4b1c720f4c4826115b49a0c3870b149e +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1004748 +--- + m4/guestfs-ocaml.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4 +index f5ac7ef..bc80e0f 100644 +--- a/m4/guestfs-ocaml.m4 ++++ b/m4/guestfs-ocaml.m4 +@@ -166,7 +166,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 -w -6" + AC_SUBST([OCAML_WARN_ERROR]) + OCAML_FLAGS="-g -annot $safe_string_option" + AC_SUBST([OCAML_FLAGS]) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..1e2c7c0 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +Disable-OCaml-warning-6-completely.patch
signature.asc
Description: PGP signature
