xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2/2] update the minimal ocaml version to 4.02
@ 2018-01-30 22:56 Michael Young
  2018-01-31 18:07 ` Christian Lindig
  0 siblings, 1 reply; 2+ messages in thread
From: Michael Young @ 2018-01-30 22:56 UTC (permalink / raw)
  To: Xen-devel
  Cc: Marcello Seri, Wei Liu, Christian Lindig, John Thomson,
	David Scott

The ocaml safe-strings patch uses code introduced in ocaml 4.02
so update the minimal version.
Signed-off-by: Michael Young <m.a.young@durham.ac.uk>
---
  stubdom/configure    | 4 ++--
  stubdom/configure.ac | 2 +-
  tools/configure      | 2 +-
  tools/configure.ac   | 2 +-
  4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/stubdom/configure b/stubdom/configure
index a7a0c09154..abb749faed 100755
--- a/stubdom/configure
+++ b/stubdom/configure
@@ -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"



diff --git a/stubdom/configure.ac b/stubdom/configure.ac
index 9fec8539d2..9066dfaaa7 100644
--- a/stubdom/configure.ac
+++ b/stubdom/configure.ac
@@ -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])
diff --git a/tools/configure b/tools/configure
index 05921b4898..feb34fc03d 100755
--- a/tools/configure
+++ b/tools/configure
@@ -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' \
diff --git a/tools/configure.ac b/tools/configure.ac
index d1a3a78d87..06eb16db4f 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -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"
-- 
2.14.3

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 2/2] update the minimal ocaml version to 4.02
  2018-01-30 22:56 [PATCH 2/2] update the minimal ocaml version to 4.02 Michael Young
@ 2018-01-31 18:07 ` Christian Lindig
  0 siblings, 0 replies; 2+ messages in thread
From: Christian Lindig @ 2018-01-31 18:07 UTC (permalink / raw)
  To: Michael Young
  Cc: Marcello Seri, Xen-devel, Wei Liu, John Thomson, David Scott



> On 30. Jan 2018, at 22:56, Michael Young <m.a.young@durham.ac.uk> wrote:
> 
> The ocaml safe-strings patch uses code introduced in ocaml 4.02
> so update the minimal version.
> Signed-off-by: Michael Young <m.a.young@durham.ac.uk>
> ---
> stubdom/configure    | 4 ++--
> stubdom/configure.ac | 2 +-
> tools/configure      | 2 +-
> tools/configure.ac   | 2 +-
> 4 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/stubdom/configure b/stubdom/configure
> index a7a0c09154..abb749faed 100755
> --- a/stubdom/configure
> +++ b/stubdom/configure
> @@ -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"
> 
> 
> 
> diff --git a/stubdom/configure.ac b/stubdom/configure.ac
> index 9fec8539d2..9066dfaaa7 100644
> --- a/stubdom/configure.ac
> +++ b/stubdom/configure.ac
> @@ -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])
> diff --git a/tools/configure b/tools/configure
> index 05921b4898..feb34fc03d 100755
> --- a/tools/configure
> +++ b/tools/configure
> @@ -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' \
> diff --git a/tools/configure.ac b/tools/configure.ac
> index d1a3a78d87..06eb16db4f 100644
> --- a/tools/configure.ac
> +++ b/tools/configure.ac
> @@ -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"
> -- 
> 2.14.3

Acked-by: Christian Lindig <christian.lindig@citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-01-31 18:19 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-30 22:56 [PATCH 2/2] update the minimal ocaml version to 4.02 Michael Young
2018-01-31 18:07 ` Christian Lindig

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).