Message ID | 1491219253-26577-1-git-send-email-ian.jackson@eu.citrix.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Mon, Apr 03, 2017 at 12:34:13PM +0100, Ian Jackson wrote: > 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@arm.com> > CC: Christian Lindig <christian.lindig@citrix.com> > CC: Jonathan Ludlam <Jonathan.Ludlam@citrix.com> > CC: David Scott <dave@recoil.org> > CC: Wei Liu <wei.liu2@citrix.com> > Tested-by: Ian Jackson <Ian.Jackson@eu.citrix.com> > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> Acked-by: Wei Liu <wei.liu2@citrix.com>
Wei Liu writes ("Re: [PATCH] tools: ocaml: In configure, check for ocamlopt"): > On Mon, Apr 03, 2017 at 12:34:13PM +0100, Ian Jackson wrote: > > CC: Julien Grall <julien.grall@arm.com> > > CC: Christian Lindig <christian.lindig@citrix.com> > > CC: Jonathan Ludlam <Jonathan.Ludlam@citrix.com> > > CC: David Scott <dave@recoil.org> > > CC: Wei Liu <wei.liu2@citrix.com> > > Tested-by: Ian Jackson <Ian.Jackson@eu.citrix.com> > > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> > > Acked-by: Wei Liu <wei.liu2@citrix.com> Christian spoke to me in person, and discussed some of the things he'd seen in this patch. I was able answer his questions to his satisfaction, so I am going commit this with his reviewed-by. Thanks, Ian.
Ian Jackson writes ("Re: [PATCH] tools: ocaml: In configure, check for ocamlopt"): > Wei Liu writes ("Re: [PATCH] tools: ocaml: In configure, check for ocamlopt"): > > On Mon, Apr 03, 2017 at 12:34:13PM +0100, Ian Jackson wrote: > > > CC: Julien Grall <julien.grall@arm.com> > > > CC: Christian Lindig <christian.lindig@citrix.com> > > > CC: Jonathan Ludlam <Jonathan.Ludlam@citrix.com> > > > CC: David Scott <dave@recoil.org> > > > CC: Wei Liu <wei.liu2@citrix.com> > > > Tested-by: Ian Jackson <Ian.Jackson@eu.citrix.com> > > > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> > > > > Acked-by: Wei Liu <wei.liu2@citrix.com> > > Christian spoke to me in person, and discussed some of the things he'd > seen in this patch. I was able answer his questions to his > satisfaction, so I am going commit this with his reviewed-by. Oh, I see Wei committed it already. I'm too slow again :-) Thanks, Ian.
diff --git a/tools/configure b/tools/configure index 7a57e65..6ea8684 100755 --- a/tools/configure +++ b/tools/configure @@ -6566,11 +6566,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 307998d..a47d0fd 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -293,9 +293,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], [