| Message ID | ac885ce2b63159d26d857dc3e53cf8aa63ae3646.1659118200.git.edvin.torok@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [RFC] tools/configure: require OCaml >= 4.06.1 for oxenstored | expand |
On 29 Jul 2022, at 19:10, Edwin Török <edvin.torok@citrix.com<mailto:edvin.torok@citrix.com>> wrote:
tools/configure | 2 +-
tools/configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Acked-by: Christian Lindig <christian.lindig@citrix.com<mailto:christian.lindig@citrix.com>>
diff --git a/tools/configure b/tools/configure index 41deb7fb96..8f391e2da4 100755 --- a/tools/configure +++ b/tools/configure @@ -6765,7 +6765,7 @@ else -e 's/[^0-9]//g'` - ax_compare_version_B=`echo "4.02.0" | sed -e 's/\([0-9]*\)/Z\1Z/g' \ + ax_compare_version_B=`echo "4.06.1" | sed -e 's/\([0-9]*\)/Z\1Z/g' \ -e 's/Z\([0-9]\)Z/Z0\1Z/g' \ -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \ -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \ diff --git a/tools/configure.ac b/tools/configure.ac index 32cbe6bd3c..7518199ec8 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -310,7 +310,7 @@ AS_IF([test "x$ocamltools" = "xy"], [ AC_MSG_ERROR([Ocaml tools enabled, but missing ocamlopt or ocamlfind])]) ocamltools="n" ], [ - AX_COMPARE_VERSION([$OCAMLVERSION], [lt], [4.02.0], [ + AX_COMPARE_VERSION([$OCAMLVERSION], [lt], [4.06.1], [ AS_IF([test "x$enable_ocamltools" = "xyes"], [ AC_MSG_ERROR([Your version of OCaml: $OCAMLVERSION is not supported])]) ocamltools="n"
OCaml 4.06.1 is widely available in distributions: https://repology.org/project/ocaml/versions oxenstored already includes some compatibility code to be able to run on versions older than 4.06, however this is slightly less efficient than just using the new features in 4.06 standard library: https://lore.kernel.org/xen-devel/b94cd2ad099486678609909e12b045c54abb2f27.camel@citrix.com/ The OCaml version in stubdom/ is unchanged for now as it is unclear how this used. Typically to run OCaml code as a stubdom one would use the mirage tooling to build a unikernel, which handles cross-compilation using Dune. The unikernel itself also uses Solo5 instead of MiniOS, so the OCaml code in stubdom/ is probably stale. Signed-off-by: Edwin Török <edvin.torok@citrix.com> Cc: Christian Lindig <christian.lindig@citrix.com> --- tools/configure | 2 +- tools/configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)