mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move minimum OCaml version to 4.04.

Browse Source 
Synchronize with common module which also requires 4.04.

Small adjustment to use of List.sort_uniq because the signature
changed slightly.
This commit is contained in:
Richard W.M. Jones
2021-11-09 10:08:03 +00:00
parent 2ecccfce38
commit 3c41324ef5
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common

Submodule common updated: 19302b64c5...62ccce4472

2
docs/guestfs-building.pod
View File

@@ -119,7 +119,7 @@ virt tools which are still written in Perl.
I<Required>. Part of Perl core.
=item OCaml E<ge> 4.01
=item OCaml E<ge> 4.04
=item OCaml findlib

3
generator/UEFI.ml
View File

@@ -77,7 +77,8 @@ let firmware = [
[];
]
let arches = List.sort_uniq (List.map (fun (arch, _, _, _, _) -> arch) firmware)
let arches =
List.sort_uniq compare (List.map (fun (arch, _, _, _, _) -> arch) firmware)
let generate_uefi_c () =
generate_header CStyle LGPLv2plus;

6
m4/guestfs-ocaml.m4
View File

@@ -38,10 +38,10 @@ AC_ARG_ENABLE([ocaml],
[],
[enable_ocaml=yes])
dnl OCaml >= 4.01 is required.
ocaml_ver_str=4.01
dnl OCaml >= 4.04 is required.
ocaml_ver_str=4.04
ocaml_min_major=4
ocaml_min_minor=1
ocaml_min_minor=4
AC_MSG_CHECKING([if OCaml version >= $ocaml_ver_str])
ocaml_major="`echo $OCAMLVERSION | $AWK -F. '{print $1}'`"
ocaml_minor="`echo $OCAMLVERSION | $AWK -F. '{print $2}' | sed 's/^0//'`"