[Xen-changelog] [xen stable-4.7] tools: ocaml: In configure, check for ocamlopt

[patchbot@xxxxxxx]

commit 7a0bf3eef7b9cc3958de61d537c699b200be4163
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Mon Apr 3 12:34:13 2017 +0100
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Thu May 18 15:48:26 2017 +0100

    tools: ocaml: In configure, check for ocamlopt
    
    If ocaml.m4 didn't find ocamlopt, disable all the ocaml builds.
    
    Currently our Makefiles do not work properly when the native code
    compiler (`ocamlopt') is not available.  In principle this should be
    fixed to fall back to bytecode, but this is not a task for this stage
    of the Xen 4.9 release.
    
    Without this change, we cannot build on systems with only ocamlc.
    That includes Debian jessie ARM64, as used on the new ARM64 hardware
    in the Xen Project CI test lab.
    
    When the Makefiles are fixed, this commit should be reverted.
    
    Committers: Please rerun autogen.sh.
    
    CC: Julien Grall <julien.grall@xxxxxxx>
    CC: Christian Lindig <christian.lindig@xxxxxxxxxx>
    CC: Jonathan Ludlam <Jonathan.Ludlam@xxxxxxxxxx>
    CC: David Scott <dave@xxxxxxxxxx>
    CC: Wei Liu <wei.liu2@xxxxxxxxxx>
    Tested-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
    Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    (cherry picked from commit 4d0240e03349fd0715332eae65372e0a47b5a43b)
    (cherry picked from commit 4057c6ea805247e3fbb1f02e3e56aad840e39cf8)
---
 tools/configure    | 4 ++--
 tools/configure.ac | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/configure b/tools/configure
index 2fde4f4..2260ea4 100755
--- a/tools/configure
+++ b/tools/configure
@@ -6481,11 +6481,11 @@ done
 
 if test "x$ocamltools" = "xy"; then :
 
-    if test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"; then :
+    if test "x$OCAMLOPT" = "xno" || test "x$OCAMLFIND" = "xno"; then :
 
         if test "x$enable_ocamltools" = "xyes"; then :
 
-            as_fn_error $? "Ocaml tools enabled, but unable to find Ocaml" 
"$LINENO" 5
+            as_fn_error $? "Ocaml tools enabled, but missing ocamlopt or 
ocamlfind" "$LINENO" 5
 fi
         ocamltools="n"
 
diff --git a/tools/configure.ac b/tools/configure.ac
index d0c9e63..f164694 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -278,9 +278,9 @@ AC_PROG_OCAML
 AC_PROG_FINDLIB
 
 AS_IF([test "x$ocamltools" = "xy"], [
-    AS_IF([test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"], [
+    AS_IF([test "x$OCAMLOPT" = "xno" || test "x$OCAMLFIND" = "xno"], [
         AS_IF([test "x$enable_ocamltools" = "xyes"], [
-            AC_MSG_ERROR([Ocaml tools enabled, but unable to find Ocaml])])
+            AC_MSG_ERROR([Ocaml tools enabled, but missing ocamlopt or 
ocamlfind])])
         ocamltools="n"
     ], [
         AX_COMPARE_VERSION([$OCAMLVERSION], [lt], [3.09.3], [
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.7

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog