Phil Holmes <m...@philholmes.net> writes: > The Darwin-PPC compile now proceeds fine following the revert. I'm now > getting a failure to build the daja-vu fonts: it looks like the font file > has not been downloaded: > > invoking tar -C /home/gub/NewGub/gub/target/tools/src/fonts-dejavu-2.35 > --strip-component=1 -v -j -xf /home/gub/NewGub/gub/downloads/fonts-dejavu > /dejavu-fonts-ttf-2.35.tar.bz2 > tar (child): /home/gub/NewGub/gub/downloads/fonts-dejavu/dejavu-fonts- > ttf-2.35.tar.bz2: Cannot open: No such file or directory > > I can confirm that that directory is empty.
Just a note: origin/release/unstable is currently _seriously_ diverged from master because it contains additional commits shown as part of git log origin/master..origin/release/unstable namely commit e10774768c04925c1d7e71b22f5d11a8c32c9df2 Author: Phil Holmes <m...@philholmes.net> Date: Sun Aug 23 16:14:17 2015 +0100 Further fix to Issue 4550 to fix GUB fail commit ff8a88eaf999491e375e61780f633fabc2b02c1c Author: Masamichi Hosoda <truer...@trueroad.jp> Date: Sun Aug 23 23:47:37 2015 +0900 Fix Issue 4550: Add "std::" to isinf() and isnan() gcc 4.9.x needs "std::" to isinf() and isnan(). I consider it a bad idea to have those changes in a release without having them in master. I think what you want to do here is to back out those changes again since they were required as a consequence of issue 4550 which has been reverted. You should be able to do this using git checkout release/unstable git reset --hard 314336b and then start over with git merge origin/master git cherry-pick c3eeea3dd # This is the release news -- David Kastrup _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel