Skip to content

Commit

Permalink
update the minimal ocaml version to 4.02
Browse files Browse the repository at this point in the history
The ocaml safe-strings patch uses code introduced in ocaml 4.02
so update the minimal version.

Signed-off-by: Michael Young <[email protected]>
Acked-by: Christian Lindig <[email protected]>
  • Loading branch information
mayoung authored and Wei Liu committed Feb 7, 2018
1 parent 5191c1e commit 66c4f0c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions stubdom/configure
Original file line number Diff line number Diff line change
Expand Up @@ -3528,10 +3528,10 @@ GRUB_VERSION="0.97"
if test "x$OCAML_URL" = "x"; then :
OCAML_URL="http://caml.inria.fr/pub/distrib/ocaml-3.11"
OCAML_URL="http://caml.inria.fr/pub/distrib/ocaml-4.02"
fi
OCAML_VERSION="3.11.0"
OCAML_VERSION="4.02.0"
Expand Down
2 changes: 1 addition & 1 deletion stubdom/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ AX_STUBDOM_LIB([LIBPCI], [libpci], [2.2.9], [http://www.kernel.org/pub/software/
AX_STUBDOM_LIB([NEWLIB], [newlib], [1.16.0], [ftp://sources.redhat.com/pub/newlib])
AX_STUBDOM_LIB([LWIP], [lwip], [1.3.0], [http://download.savannah.gnu.org/releases/lwip])
AX_STUBDOM_LIB([GRUB], [grub], [0.97], [http://alpha.gnu.org/gnu/grub])
AX_STUBDOM_LIB_NOEXT([OCAML], [ocaml], [3.11.0], [http://caml.inria.fr/pub/distrib/ocaml-3.11])
AX_STUBDOM_LIB_NOEXT([OCAML], [ocaml], [4.02.0], [http://caml.inria.fr/pub/distrib/ocaml-4.02])
AX_STUBDOM_LIB([GMP], [libgmp], [4.3.2], [ftp://ftp.gmplib.org/pub/gmp-4.3.2])
AX_STUBDOM_LIB([POLARSSL], [polarssl], [1.1.4], [http://polarssl.org/code/releases])
AX_STUBDOM_LIB([TPMEMU], [berlios tpm emulator], [0.7.4], [http://download.berlios.de/tpm-emulator])
Expand Down
2 changes: 1 addition & 1 deletion tools/configure
Original file line number Diff line number Diff line change
Expand Up @@ -6616,7 +6616,7 @@ else
-e 's/[^0-9]//g'`


ax_compare_version_B=`echo "3.09.3" | sed -e 's/\([0-9]*\)/Z\1Z/g' \
ax_compare_version_B=`echo "4.02.0" | 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' \
Expand Down
2 changes: 1 addition & 1 deletion tools/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,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], [3.09.3], [
AX_COMPARE_VERSION([$OCAMLVERSION], [lt], [4.02.0], [
AS_IF([test "x$enable_ocamltools" = "xyes"], [
AC_MSG_ERROR([Your version of OCaml: $OCAMLVERSION is not supported])])
ocamltools="n"
Expand Down

0 comments on commit 66c4f0c

Please sign in to comment.