Re: [PATCH] Assorted fixes for macosx 10.2.8

[Johannes Schindelin]

Hi,

On Wed, 7 Dec 2005, Graham Percival wrote:

> I don't understand most of these patch,

I'll try to explain:

> > diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
> > index 6ab1df3..9b9821a 100644
> > --- a/Documentation/user/GNUmakefile
> > +++ b/Documentation/user/GNUmakefile
> > @@ -43,6 +43,7 @@ info: $(INFO_FILES)
> > 
> >  pathsettings:
> >     @echo export PATH=$(PATH)
> > +   @echo export LILYPOND_DATADIR=$(LILYPONDPREFIX)
> >     @echo export LILYPONDPREFIX=$(LILYPONDPREFIX)
> >     @echo export PYTHONPATH=$(PYTHONPATH)

This is needed so that lilypond does not try to use 
/usr/local/share/something, but the files from where lilypond is compiled.

> > diff --git a/lily/GNUmakefile b/lily/GNUmakefile
> > index 8d2e91a..fb9192e 100644
> > --- a/lily/GNUmakefile
> > +++ b/lily/GNUmakefile
> > @@ -67,10 +67,11 @@ endif
> > 
> >  # force these: Make can't know these have to be generated in advance
> >  $(outdir)/lily-parser.o: $(outdir)/parser.hh
> > -$(outdir)/lily-lexer.o: $(outdir)/parser.hh $(outdir)/FlexLexer.h
> > +$(outdir)/lily-lexer.o: $(outdir)/parser.hh
> >  $(outdir)/lexer.o: $(outdir)/parser.hh $(outdir)/version.hh
> > 
> >  ifneq ($(FLEXLEXER_FILE),)
> > +$(outdir)/lily-lexer.o: $(outdir)/FlexLexer.h
> >  $(outdir)/FlexLexer.h: $(FLEXLEXER_FILE) $(config_h)
> >     cp $< $@
> >  endif

This fixes the dependency on FlexLexer.h when configure determined that 
there is none.

> > diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
> > index 798f466..50f5b07 100644
> > --- a/ly/music-functions-init.ly
> > +++ b/ly/music-functions-init.ly
> > @@ -51,12 +51,12 @@ displayMusic =
> >  %% FIXME: guile-1.7 required?
> >  %#(use-modules (scm display-lily))invalid module name for use-syntax ((srfi
> > srfi-39))
> > 
> > -#(use-modules (scm display-lily))
> > -#(display-lily-init parser)
> > -displayLilyMusic =
> > -#(def-music-function (parser location music) (ly:music?)
> > -   (display-lily-music music)
> > -   music)
> > +%#(use-modules (scm display-lily))
> > +%#(display-lily-init parser)
> > +%displayLilyMusic =
> > +%#(def-music-function (parser location music) (ly:music?)
> > +%   (display-lily-music music)
> > +%   music)
> > 
> >  applyOutput =
> >  #(def-music-function (parser location proc) (procedure?)

I agree with Han-Wen that this should not be applied. However, I seem to 
be unable to find out just why this does not parse on my iBook, even with 
the newest CVS of guile! Someone has ideas as to why, please speak up!

> > diff --git a/my-lexer-gcc-3.1.sh b/my-lexer-gcc-3.1.sh
> > new file mode 100644
> > index 0000000..c781409
> > --- /dev/null
> > +++ b/my-lexer-gcc-3.1.sh
> > @@ -0,0 +1,10 @@
> > +#!/bin/sh
> > +
> > +cd "$(dirname "$0")/lily"
> > +
> > +rm out/lexer.cc 2>/dev/null
> > +make out/lexer.cc
> > +mv out/lexer.cc out/lexer.cc.orig
> > +cat out/lexer.cc.orig | sed 's/^class istream;$/#include <iostream>\
> > +using namespace std;/' > out/lexer.cc
> > +

This is a very simple fix for my very special setup. Unless someone 
verifies that it helps on other platforms, too, I'd rather see it as "it 
helped me, maybe it helps you" hint.

> > diff --git a/stepmake/stepmake/compile-vars.make
> > b/stepmake/stepmake/compile-vars.make
> > index b39499b..9af6eb5 100644
> > --- a/stepmake/stepmake/compile-vars.make
> > +++ b/stepmake/stepmake/compile-vars.make
> > @@ -3,10 +3,14 @@ ARFLAGS = ru
> >  ALL_LDFLAGS = $(LDFLAGS) $(CONFIG_LDFLAGS) $($(PACKAGE)_LDFLAGS)
> > $(MODULE_LDFLAGS) $(CONFIG_LDFLAGS)
> > 
> >  PIC_FLAGS = -fpic -fPIC
> > -ifeq ($(MINGW_BUILD),)
> > -SHARED_FLAGS = -shared
> > -else
> > +ifneq ($(MINGW_BUILD),)
> >  SHARED_FLAGS = -mdll
> > +else
> > +ifneq ($(DARWIN_BUILD),)
> > +SHARED_FLAGS = -bundle -flat_namespace -framework Python
> > +else
> > +SHARED_FLAGS = -shared
> > +endif
> >  endif
> > 
> >  o-dep-out = $(outdir)/$(subst .o,.dep,$(notdir $@))#

I agree with Han-Wen that this should go into python-vars.make. 
Unfortunately, it did not get picked up that way. I have to investigate.

> > diff --git a/stepmake/stepmake/generic-vars.make
> > b/stepmake/stepmake/generic-vars.make
> > index fc7e89e..0de08f8 100644
> > --- a/stepmake/stepmake/generic-vars.make
> > +++ b/stepmake/stepmake/generic-vars.make
> > @@ -111,3 +111,8 @@ endif
> >  ifeq ($(HOST_ARCH),i386-mingw32)
> >  MINGW_BUILD = yes
> >  endif
> > +
> > +ifeq ($(HOST_ARCH),ppc-darwin)
> > +DARWIN_BUILD = yes
> > +endif
> > +

I think this is more or less uncontroversial. It defines the variable 
DARWIN_BUILD on Darwin, so that the Makefiles can have special casing for 
Darwin as they have special handling of MinGW.

Hth,
Dscho