On Tue, 14 May 2019 00:39:07 +0200 Alexis Murzeau <amub...@gmail.com> wrote: > Le 13/05/2019 à 08:08, Sylvestre Ledru a écrit : > > > > On 12/05/2019 22:10, Julien Puydt wrote: > >> Hi, > >> > >> On 12/05/2019 11:46, Alexis Murzeau wrote: > >> > >>> I saw that there is a bugfix release 6.0.2 with many fixes [0]. > >> I had started to package 6.0.2 on salsa already in february. I removed > >> the patch about Linenum as that was supposed to have been reworked and > >> fixed, and it now fails with : > >> > >> ocamlopt -o XML2Modelica -I ./src/modelica_compiler -I > >> ./src/xml2modelica nums.cmxa ./src/xml2modelica/xMLTree.ml > >> ./src/xml2modelica/linenum.ml ./src/xml2modelica/stringParser.ml > >> ./src/xml2modelica/stringLexer.ml ./src/xml2modelica/xMLParser.ml > >> ./src/xml2modelica/xMLLexer.ml > >> ./src/xml2modelica/modelicaCodeGenerator.ml > >> ./src/xml2modelica/xML2Modelica.ml > >> File "./src/xml2modelica/xML2Modelica.ml", line 1: > >> Error: Files ./src/xml2modelica/xMLParser.cmx > >> and ./src/xml2modelica/linenum.cmx > >> make inconsistent assumptions over implementation Linenum > >> > >> ie : it looks like upstream's fix isn't correct. > > > > + upstream > > > > S > > > > > > Reversing the order of the includes parameters when compiling > XML2Modelica fix the build for me, ie. including xml2modelica first: > `-I ./src/xml2modelica -I ./src/modelica_compiler` > > I think ocamlopt prefer to use a part of Linenum from > ./src/modelica_compiler and the other one from ./src/xml2modelica which > lead to the error. > > But I'm not sure this is the way to handle it cleanly. > The files "linenum.mll" are almost the same between both directories. > The only difference is the comment at the beginning of the file. > > Maybe some of these "linenum.mll" file can be removed to keep only one ?
Ubuntu has packaged 6.0.2 for Disco and Eoan, please see https://launchpad.net/ubuntu/+source/scilab or fetch the DSC directly from https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/scilab/6.0.2-0ubuntu2/scilab_6.0.2-0ubuntu2.dsc > > -- > Alexis Murzeau > PGP: B7E6 0EBB 9293 7B06 BDBC 2787 E7BD 1904 F480 937F > >