Junio C HamanoLuben Tuikov <ltuikov@yahoo.com> writes:
Show 6 quoted lines
> Over the last 2 months each time I pull, check out next and compile, > I'm seeing _some_ kind of problem with compiling the perl section > of git. Sometimes git-reset --hard, or a fresh checkout, or git-clean > resolve the situation. But not this time. > ... > So, where is "perl.mak"?
This particular breakage cannot be "last two months", but there was a recent breakage by commit f848718a last week on the 'master' branch.
--- Junio C Hamano <junkio@cox.net> writes:
Show 19 quoted lines
> merlyn@stonehenge.com (Randal L. Schwartz) writes: > >>>>>>> "Alex" == Alex Riesen <raa.lkml@gmail.com> writes: >> >> Alex> Strange. You seem to have the old, generated Makefile you perl/ >> Alex> directory. Haven't your pull failed? If so, I suspect that >> >> Alex> rm perl/Makefile >> Alex> git reset --hard >> Alex> git pull git... >> >> I ended up having to do another reset afterward. >> >> Definitely something went weird when Makefile was removed >> from .gitignore. > > Yes, perl/Makefile is getting overwritten by what Makefile.PL > generates. I thought the point of Alex's patch was to have it > muck with perl.mak and leave the tracked Makefile alone?
Now, I am CLUELESS about what MakeMaker does, but would this help?
---
diff --git a/perl/Makefile b/perl/Makefile index bd483b0..099beda 100644 --- a/perl/Makefile +++ b/perl/Makefile @@ -29,7 +29,7 @@ $(makfile): ../GIT-CFLAGS Makefile echo ' echo $(instdir_SQ)' >> $@ else $(makfile): Makefile.PL ../GIT-CFLAGS - '$(PERL_PATH_SQ)' $< FIRST_MAKEFILE='$@' PREFIX='$(prefix_SQ)' + '$(PERL_PATH_SQ)' $< PREFIX='$(prefix_SQ)' endif # this is just added comfort for calling make directly in perl dir diff --git a/perl/Makefile.PL b/perl/Makefile.PL index de73235..4168775 100644 --- a/perl/Makefile.PL +++ b/perl/Makefile.PL @@ -24,5 +24,6 @@ WriteMakefile( NAME => 'Git', VERSION_FROM => 'Git.pm', PM => \%pm, + MAKEFILE => 'perl.mak', %extra );