Am 24.06.2016 um 10:33 schrieb David Kastrup:
[...]

Well, it got through patchy-staging.  So obviously something is
different with your setup, and you don't give any information about your
setup.  What does g++ --version say?

$ g++ --version
g++ (Ubuntu 4.8.4-2ubuntu1~14.04.3) 4.8.4
Copyright (C) 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.



You used git pull (rather than git pull -r).  That causes a merge rather
than a rebase.  Recent changes in master happened to be reverts which
did not apply cleanly but had to be significantly edited.

Adding merge resolution on top might lead to problems.

As mentioned earlier, I started from scratch just to be on the safe side:

$ git clone git://git.sv.gnu.org/lilypond.git ./lilypond
$ cd lilypond
$ ./autogen.sh
$ make -j3

The error remains.

Marc



_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Reply via email to