[Libguestfs] [PATCH 1/9] build: Require OCaml >= 4.02.

Richard W.M. Jones rjones at redhat.com
Wed Oct 4 12:56:22 UTC 2017


RHEL 6, RHEL <= 7.4, Debian 8 and Ubuntu 14.04 are no longer supported
(unless OCaml and other components are upgraded).

See: https://www.redhat.com/archives/libguestfs/2017-September/msg00203.html
---
 docs/guestfs-building.pod |  2 +-
 m4/guestfs_ocaml.m4       | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/guestfs-building.pod b/docs/guestfs-building.pod
index 187da37be..d7a0b521b 100644
--- a/docs/guestfs-building.pod
+++ b/docs/guestfs-building.pod
@@ -116,7 +116,7 @@ virt tools which are still written in Perl.
 
 I<Required>.  Part of Perl core.
 
-=item OCaml E<ge> 3.11
+=item OCaml E<ge> 4.02
 
 =item OCaml findlib
 
diff --git a/m4/guestfs_ocaml.m4 b/m4/guestfs_ocaml.m4
index f3d470929..162ec0dde 100644
--- a/m4/guestfs_ocaml.m4
+++ b/m4/guestfs_ocaml.m4
@@ -38,15 +38,15 @@ AC_ARG_ENABLE([ocaml],
     [],
     [enable_ocaml=yes])
 
-dnl OCaml >= 3.11 is required.
-AC_MSG_CHECKING([if OCaml version >= 3.11])
+dnl OCaml >= 4.02 is required.
+AC_MSG_CHECKING([if OCaml version >= 4.02])
 ocaml_major="`echo $OCAMLVERSION | $AWK -F. '{print $1}'`"
-ocaml_minor="`echo $OCAMLVERSION | $AWK -F. '{print $2}'`"
-AS_IF([test "$ocaml_major" -ge 4 || ( test "$ocaml_major" -eq 3 && test "$ocaml_minor" -ge 11 )],[
-    AC_MSG_RESULT([yes])
+ocaml_minor="`echo $OCAMLVERSION | $AWK -F. '{print $2}' | sed 's/^0//'`"
+AS_IF([test "$ocaml_major" -ge 5 || ( test "$ocaml_major" -eq 4 && test "$ocaml_minor" -ge 2 )],[
+    AC_MSG_RESULT([yes ($ocaml_major, $ocaml_minor)])
 ],[
     AC_MSG_RESULT([no])
-    AC_MSG_FAILURE([OCaml compiler is not new enough.  At least OCaml 3.11 is required])
+    AC_MSG_FAILURE([OCaml compiler is not new enough.  At least OCaml 4.02 is required])
 ])
 
 AM_CONDITIONAL([HAVE_OCAML],
-- 
2.13.2




More information about the Libguestfs mailing list