tags 868960 + patch thanks On 20/07/2017 00:32, Stéphane Glondu wrote: > A possible fix is to compile files in ./src/xml2modelica without the "-I > ./src/modelica_compiler" option.
Attached is a patch (to be dropped in debian/patches) that does that. It should be compatible with the ocaml currently in unstable. Please upload as soon as possible, to ease the future OCaml transition. Cheers, -- Stéphane
Description: Fix FTBFS with OCaml 4.05.0 Author: Stéphane Glondu <glo...@debian.org> Bug-Debian: https://bugs.debian.org/868960 Last-Update: 2017-07-19 --- scilab-5.5.2.orig/modules/scicos/Makefile.modelica.am +++ scilab-5.5.2/modules/scicos/Makefile.modelica.am @@ -98,6 +98,7 @@ MLIS_modelicac = $(MLS:.ml=.mli) BASE_PATH_MODELICAC = $(srcdir)/src/modelica_compiler INCLUDE = -I $(BASE_PATH_MODELICAC) -I $(BASE_PATH_XML2Modelica) +INCLUDE_xml2modelica = -I $(BASE_PATH_XML2Modelica) ########## COMMON SUFFIXES += .ml .mli .mll .mly .cmo .cmi .cmx @@ -108,6 +109,9 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi @if echo "$<"|grep src/translator; then \ echo $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $*.ml; \ $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $*.ml; \ + elif echo "$<"|grep src/xml2modelica; then \ + echo $(OCAMLC) $(INCLUDE_xml2modelica) $(OCAMLCFLAGS) -c $*.ml; \ + $(OCAMLC) $(INCLUDE_xml2modelica) $(OCAMLCFLAGS) -c $*.ml; \ else \ echo $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $*.ml; \ $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $*.ml; \ @@ -117,6 +121,9 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi @if echo "$<"|grep src/translator; then \ echo $(OCAMLOPT) $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) -c $*.ml; \ $(OCAMLOPT) $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) -c $*.ml; \ + elif echo "$<"|grep src/xml2modelica; then \ + echo $(OCAMLOPT) $(INCLUDE_xml2modelica) $(OCAMLOPTFLAGS) -c $*.ml; \ + $(OCAMLOPT) $(INCLUDE_xml2modelica) $(OCAMLOPTFLAGS) -c $*.ml; \ else \ echo $(OCAMLOPT) $(INCLUDE) $(OCAMLOPTFLAGS) -c $*.ml; \ $(OCAMLOPT) $(INCLUDE) $(OCAMLOPTFLAGS) -c $*.ml; \ @@ -126,6 +133,9 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi @if echo "$<"|grep src/translator; then \ echo $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $<; \ $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $<; \ + elif echo "$<"|grep src/xml2modelica; then \ + echo $(OCAMLC) $(INCLUDE_xml2modelica) $(OCAMLCFLAGS) -c $<; \ + $(OCAMLC) $(INCLUDE_xml2modelica) $(OCAMLCFLAGS) -c $<; \ else \ echo $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $<; \ $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $<; \ @@ -135,6 +145,9 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi @if echo "$<"|grep src/translator; then \ echo $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -i $< > $@; \ $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -i $< > $@; \ + elif echo "$<"|grep src/xml2modelica; then \ + echo $(OCAMLC) $(INCLUDE_xml2modelica) $(OCAMLCFLAGS) -i $< > $@; \ + $(OCAMLC) $(INCLUDE_xml2modelica) $(OCAMLCFLAGS) -i $< > $@; \ else \ echo $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -i $< > $@; \ $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -i $< > $@; \
-- debian-science-maintainers mailing list debian-science-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers