>> I've attach these patches to this mail. >> >> cygwin-python.patch: >> Set LDFLAGS to build python module >> >> cygwin-remove-pathconv.patch: >> Remove cygwin_conv_to_posix_path >> This patch is similar to yours. > > Don't know enough about Cygwin to know whether those two are the right > thing. I'd recommend passing them through review separately.
I think that these two patches are tentative. I want to improve them. Then, may I upload them to Rietveld? >> cygwin-env-TMP.patch: >> Don't use environment variable TMP when "make doc" >> If I understand correctly, >> cygwin system use environment variable TMP for a special purpose. >> In other words, on cygwin, >> it can not be used for other purpose like Makefile variable. > > That one is clearly a good idea. I'd not mind it being pushed directly > to staging. > > However, doing "git grep TMP" I also find > scripts/lilypond-invoke-editor.scm: (or > (getenv "TMP") > > which is from > > (or (getenv "TMP") > (getenv "TEMP") > "/tmp") > > and > > stepmake/stepmake/metafont-rules.make: $(DO_MF_DEP) TMP=`mktemp -d > $(outdir)/pfbtemp.$*.XXXXXXXXX` \ > stepmake/stepmake/metafont-rules.make: && ( cd $$TMP \ > stepmake/stepmake/metafont-rules.make: && mv $$TMP/*pfb $(outdir); \ > stepmake/stepmake/metafont-rules.make: rm -rf $$TMP > > The latter would need another similar fix. And the former uses > Windows-only conventions: the POSIX convention is to look in the TMPDIR > variable. So it might warrant putting a TMPDIR check in front. > > The TMPDIR patch should likely be separate (as it is a different issue > and just discovered in parallel). But the metafont-rules.make fix > belongs with the other ones I think. I've attached the renaming makefiles TMP variables patch to this mail.
>From aab1bada37a741025f0710842702da3eed0cf027 Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda <truer...@trueroad.jp> Date: Tue, 14 Apr 2015 23:36:35 +0900 Subject: [PATCH] Rename makefile variable TMP Windows (cygwin and mingw) system uses environment variable TMP for a special purpose. It can not be used for other purpose like makefile variable. --- input/regression/abc2ly/GNUmakefile | 4 ++-- input/regression/midi/GNUmakefile | 4 ++-- stepmake/stepmake/metafont-rules.make | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/input/regression/abc2ly/GNUmakefile b/input/regression/abc2ly/GNUmakefile index 7356f99..438deba 100644 --- a/input/regression/abc2ly/GNUmakefile +++ b/input/regression/abc2ly/GNUmakefile @@ -5,8 +5,8 @@ LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc abc TEXI2HTML_FLAGS += --nomenu -TMP = $(sort $(ABC_FILES) $(TEXINFO_SOURCES) ) -COLLATED_FILES = ${TMP:%.abc=$(outdir)/%.ly} +TMP_FILES = $(sort $(ABC_FILES) $(TEXINFO_SOURCES) ) +COLLATED_FILES = ${TMP_FILES:%.abc=$(outdir)/%.ly} include $(depth)/make/stepmake.make diff --git a/input/regression/midi/GNUmakefile b/input/regression/midi/GNUmakefile index 682bf82..d6be6f6 100644 --- a/input/regression/midi/GNUmakefile +++ b/input/regression/midi/GNUmakefile @@ -5,8 +5,8 @@ LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc midi TEXI2HTML_FLAGS += --nomenu -TMP = $(sort $(LY_FILES) $(TEXINFO_SOURCES) ) -COLLATED_FILES = ${TMP:%.ly=$(outdir)/%-midi.ly} +TMP_FILES = $(sort $(LY_FILES) $(TEXINFO_SOURCES) ) +COLLATED_FILES = ${TMP_FILES:%.ly=$(outdir)/%-midi.ly} include $(depth)/make/stepmake.make diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make index 1db7974..45ff320 100644 --- a/stepmake/stepmake/metafont-rules.make +++ b/stepmake/stepmake/metafont-rules.make @@ -19,15 +19,15 @@ $(outdir)/%.tfm $(outdir)/%.log: %.mf # the soft link for mf2pt1.mp is for recent mpost versions # which no longer dump a .mem file $(outdir)/%.pfb: %.mf $(outdir)/mf2pt1.mem $(outdir)/%.log - $(DO_MF_DEP) TMP=`mktemp -d $(outdir)/pfbtemp.$*.XXXXXXXXX` \ - && ( cd $$TMP \ + $(DO_MF_DEP) TMP_DIR=`mktemp -d $(outdir)/pfbtemp.$*.XXXXXXXXX` \ + && ( cd $$TMP_DIR \ && ln -s ../mf2pt1.mem . \ && ln -s ../../mf2pt1.mp . \ && MFINPUTS=$(abs-src-dir):..:: \ FONTFORGE=$(FONTFORGE) \ $(buildscript-dir)/mf2pt1 $(MF2PT1_OPTIONS) $< $(METAFONT_QUIET)) \ - && mv $$TMP/*pfb $(outdir); \ - rm -rf $$TMP + && mv $$TMP_DIR/*pfb $(outdir); \ + rm -rf $$TMP_DIR # since recent mpost versions no longer create a mem file, we create a dummy # file to satisfy the dependency (which gets overwritten in case an older -- 2.1.4
_______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel