rpm/libguestfs
SHA256
1
0
Fork 0
forked from pool/libguestfs
Code Pull Requests Activity

- Fix build errors in Factory

Browse Source 
* Alert ocaml_deprecated_cli: Setting a warning with a sequence
    of lowercase or uppercase letters, like 'CDEFLMPSUVYZX', is
    deprecated.
  63c9cd93-m4-guestfs-ocaml.m4-Fix-deprecated-warning-format.patch
  * Error (warning 6 [labels-omitted]): label verbose was omitted
    in the application of this function.
  a4930f5f-customize-Suppress-OCaml-warning.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=486
This commit is contained in:
Charles Arnold 2021-10-27 03:27:22 +00:00 committed by Git OBS Bridge
parent a7c0f2faa1
commit cfd5004acf
4 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
63c9cd93-m4-guestfs-ocaml.m4-Fix-deprecated-warning-format.patch Normal file
View File

@ -0,0 +1,27 @@
Subject: m4/guestfs-ocaml.m4: Fix deprecated warning format
From: Richard W.M. Jones rjones@redhat.com Tue Oct 5 20:51:19 2021 +0100
Date: Tue Oct 5 21:08:07 2021 +0100:
Git: 63c9cd933af75ca759fa2f2bbdbb07a699df5b30
In OCaml 4.13:
Alert ocaml_deprecated_cli: Setting a warning with a sequence of lowercase or uppercase letters,
like 'CDEFLMPSUVYZX', is deprecated.
Use the equivalent signed form: +C+D+E+F+L+M+P+S+U+V+Y+Z+X+52-3.
(cherry picked from
guestfs-tools commit fa4f59e1d99c08d7e0bae2a7cb54f254a6506d67)
diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4
index 4b8a44dee..d7f9462ea 100644
--- a/m4/guestfs-ocaml.m4
+++ b/m4/guestfs-ocaml.m4
@@ -232,7 +232,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"
AC_SUBST([OCAML_WARN_ERROR])
OCAML_FLAGS="-g -annot $safe_string_option"
AC_SUBST([OCAML_FLAGS])

23
a4930f5f-customize-Suppress-OCaml-warning.patch Normal file
View File

@ -0,0 +1,23 @@
Subject: customize: Suppress OCaml warning
From: Richard W.M. Jones rjones@redhat.com Tue Oct 5 20:53:25 2021 +0100
Date: Tue Oct 5 20:53:25 2021 +0100:
Git: a4930f5fad82e5358d565b8cf3610970e9646259
In OCaml 4.13:
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.
--- a/m4/guestfs-ocaml.m4
+++ b/m4/guestfs-ocaml.m4
@@ -232,7 +232,7 @@ EOF
])
dnl Flags we want to pass to every OCaml compiler call.
-OCAML_WARN_ERROR="-warn-error +C+D+E+F+L+M+P+S+U+V+Y+Z+X+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])

12
libguestfs.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Oct 26 20:44:52 MDT 2021 - carnold@suse.com
- Fix build errors in Factory
* Alert ocaml_deprecated_cli: Setting a warning with a sequence
of lowercase or uppercase letters, like 'CDEFLMPSUVYZX', is
deprecated.
63c9cd93-m4-guestfs-ocaml.m4-Fix-deprecated-warning-format.patch
* Error (warning 6 [labels-omitted]): label verbose was omitted
in the application of this function.
a4930f5f-customize-Suppress-OCaml-warning.patch
-------------------------------------------------------------------
Tue Oct 5 15:53:39 MDT 2021 - carnold@suse.com

2
libguestfs.spec
View File

@ -148,6 +148,8 @@ Patch3: 68a02c2f-customize--resize--sparsify--sysprep-Link-explicitly-wi
Patch4: c0de4de9-appliance-add-reboot-and-netconfig-for-SUSE.patch
Patch5: 9db0c98c-appliance-enable-bashs-Process-Substitution-feature.patch
Patch6: f47e0bb6-appliance-reorder-mounting-of-special-filesystems-in-init.patch
Patch7: 63c9cd93-m4-guestfs-ocaml.m4-Fix-deprecated-warning-format.patch
Patch8: a4930f5f-customize-Suppress-OCaml-warning.patch
# Pending upstram review
Patch50: 0001-Introduce-a-wrapper-around-xmlParseURI.patch