Re: ocamlopt not in s390 version of ocaml-nox. Why?

[Samuel Mimram <smimram@debian.org>]

tag 372074 + patch
thanks

Hi,

On Sat, Jun 10, 2006 at 03:22:43PM +0200, Julien Cristau wrote:
> On Sat, Jun 10, 2006 at 14:10:09 +0100, Esteban Manchado Velázquez wrote:
> >     So, the question is, why isn't ocamlopt in the ocaml-nox package for s390?
> > Is there any workaround, or simply cameleon won't work in that architecture?
> > 
> ocamlopt isn't there because building to native code is not supported on
> this architecture.
> cameleon should use ocamlc when ocamlopt isn't available.
> Unfortunately, cameleon seems to use a complicated ocaml script for its
> configuration.

The attached patch seems to correct this problem. With it, I've been able to
build cameleon after having removed ocamlopt(.opt) on my box.

Cheers,

Samuel.

--- cameleon-1.9.13.orig/utils/checkocaml.ml
+++ cameleon-1.9.13/utils/checkocaml.ml
@@ -859,7 +859,7 @@
 (*/c==v=[OCaml_conf.detect_xml_light]=0.1====*)

 let ocaml_required = [3;9;1]
-let conf = ocaml_conf ~withopt: true  ();;
+let conf = ocaml_conf ~withopt:false  ();;
 print_conf conf;;

 let _ =
@@ -871,12 +871,12 @@

 let _ = !print "\n### checking required tools and libraries ###\n"
 let _ =
-  match detect_xml_light conf with
+  match detect_xml_light ~modes:[`Byte] conf with
     "", [] -> !fatal_error "Could not link with Xml-light"
   | s, _ -> add_subst "XMLLIGHT_INCLUDES" s

 let _ =
-  match detect_lablgtk2 conf with
+  match detect_lablgtk2 ~modes:[`Byte] conf with
     "", [] -> !fatal_error "Could not link with LablGtk2"
   | s, _ -> add_subst "LABLGTK2_INCLUDES" s