{"thread":{"id":"43323","subject":"Re: Commit f84871 breaks build on OS X","startedAt":"2006-12-07T13:54:38Z","lastAt":"2006-12-08T11:51:08Z","messageCount":12,"participants":["Alex Riesen","Brian Gernhardt","Johannes Schindelin","Pazu","Randal L. Schwartz","Andreas Ericsson","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"297747","messageId":"2D096A57-D7B3-49C7-81E4-EB47A0D933B2@silverinsanity.com","threadId":"43323","inReplyTo":null,"subject":"Commit f84871 breaks build on OS X","fromName":"Brian Gernhardt","fromEmail":"benji@silverinsanity.com","sentAt":"2006-12-07T13:54:38Z","receivedAt":"2006-12-07T13:54:38Z","isPatch":false,"sender":{"key":"benji@silverinsanity.com","avatar":"https://gravatar.com/avatar/e06c101dbc25c68114d859b4a9ec7cf8a2c52fd2b0270ef0eac0e2e63ff22311?d=mp&s=160"},"body":"When I pulled the most recent changes for git (de51faf), `make` began \nfailing with the following messages:\n\nmake -C perl PERL_PATH='/usr/bin/perl' prefix='/usr/local/stow/git' all\nMakefile out-of-date with respect to Makefile.PL /System/Library/Perl/ \n5.8.6/darwin-thread-multi-2level/Config.pm /System/Library/Perl/5.8.6/ \ndarwin-thread-multi-2level/CORE/config.h\nCleaning current config before rebuilding Makefile...\nmv: rename perl.mak to perl.mak.old: No such file or directory\nmake[1]: *** [perl.mak] Error 1\nmake: *** [all] Error 2\n\nMy system is (OS 10.4.8):\n\n$ uname -a\nDarwin 127.0.0.1 8.8.1 Darwin Kernel Version 8.8.1: Mon Sep 25 \n19:42:00 PDT 2006; root:xnu-792.13.8.obj~1/RELEASE_I386 i386 i386\n$ fink --version\nPackage manager version: 0.25.2\nDistribution version: 0.8.1.rsync i386\n$ cat config.mak\nprefix=/usr/local/stow/git\nCOLLISION_CHECK=y\nNO_DARWIN_PORTS=y\n\nI started trying to use `git bisect` and after several attempts (I \neventually learned the correct pattern of `rm perl/Makefile` and `git \nreset --hard`) I found out that the error began with\n\ncommit f848718a6980ebda0eb5afb2ca49c3bc1e7b2b1d\nAuthor: Alex Riesen \nDate: Mon Dec 4 10:50:04 2006 +0100\n\n Make perl/ build procedure ActiveState friendly.\n\n On Cygwin + ActivateState Perl, Makefile generated with\n MakeMaker is not usable because of line-endings and\n back-slashes.\n\n This teaches perl/Makefile to write a handcrafted equivalent\n perl.mak file with 'make NO_PERL_MAKEMAKER=NoThanks'.\n\n Signed-off-by: Alex Riesen \n Signed-off-by: Junio C Hamano \n\nI'll admit that I'm not savvy enough with make and perl to figure out \nhow to correct it, although `git revert f84871` does fix it. Can \nanyone help?\n\n"},{"id":"294863","messageId":"81b0412b0612070633i7aec43dse7a8beda64437103@mail.gmail.com","threadId":"43323","inReplyTo":"2D096A57-D7B3-49C7-81E4-EB47A0D933B2@silverinsanity.com","subject":"Re: Commit f84871 breaks build on OS X","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2006-12-07T14:33:16Z","receivedAt":"2006-12-07T14:33:16Z","isPatch":false,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On 12/7/06, Brian Gernhardt wrote:\n> When I pulled the most recent changes for git (de51faf), `make` began\n> failing with the following messages:\n>\n> make -C perl PERL_PATH='/usr/bin/perl' prefix='/usr/local/stow/git' all\n> Makefile out-of-date with respect to Makefile.PL /System/Library/Perl/\n> 5.8.6/darwin-thread-multi-2level/Config.pm /System/Library/Perl/5.8.6/\n> darwin-thread-multi-2level/CORE/config.h\n\nStrange. You seem to have the old, generated Makefile you perl/\ndirectory. Haven't your pull failed? If so, I suspect that\n\n rm perl/Makefile\n git reset --hard\n git pull git...\n\n"},{"id":"295186","messageId":"Pine.LNX.4.63.0612071554180.28348@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"43323","inReplyTo":"2D096A57-D7B3-49C7-81E4-EB47A0D933B2@silverinsanity.com","subject":"Re: Commit f84871 breaks build on OS X","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-12-07T14:55:03Z","receivedAt":"2006-12-07T14:55:03Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Thu, 7 Dec 2006, Brian Gernhardt wrote:\n\n> When I pulled the most recent changes for git (de51faf), `make` began \n> failing with the following messages: [...]\n\nI found the same, but could not reproduce it. But a \"touch perl/perl.mak\" \nfixes at least compilation.\n\nCiao,\nDscho\n"},{"id":"296169","messageId":"loom.20061207T161845-377@post.gmane.org","threadId":"43323","inReplyTo":"81b0412b0612070633i7aec43dse7a8beda64437103@mail.gmail.com","subject":"Re: Commit f84871 breaks build on OS X","fromName":"Pazu","fromEmail":"pazu@pazu.com.br","sentAt":"2006-12-07T15:20:53Z","receivedAt":"2006-12-07T15:20:53Z","isPatch":false,"sender":{"key":"pazu@pazu.com.br","avatar":null},"body":"Alex Riesen gmail.com> writes:\n\n> Strange. You seem to have the old, generated Makefile you perl/\n> directory. Haven't your pull failed? If so, I suspect that\n\nI've found the same problem as the OP. First my pull failed like you said, but\nthen I completely wiped my working copy and tried checkout again -- this time it\nworked fine. However, the build still fails with the error mentioned by the OP.\n\n-- Pazu\n"},{"id":"298001","messageId":"457831F0.3090305@op5.se","threadId":"43323","inReplyTo":"Pine.LNX.4.63.0612071554180.28348@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: Commit f84871 breaks build on OS X","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2006-12-07T15:23:28Z","receivedAt":"2006-12-07T15:23:28Z","isPatch":false,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Johannes Schindelin wrote:\n> Hi,\n> \n> On Thu, 7 Dec 2006, Brian Gernhardt wrote:\n> \n>> When I pulled the most recent changes for git (de51faf), `make` began \n>> failing with the following messages: [...]\n> \n> I found the same, but could not reproduce it. But a \"touch perl/perl.mak\" \n> fixes at least compilation.\n> \n\nI had to do the same. Somewhere, there's a \"mv\" that tries to move \nperl.mak out of the way and doesn't properly detect the fact that it \nisn't there.\n\n-- \nAndreas Ericsson andreas.ericsson@op5.se\nOP5 AB www.op5.se\n"},{"id":"295945","messageId":"E8038C15-B359-4DE9-B3E0-45B065AEDBFA@silverinsanity.com","threadId":"43323","inReplyTo":"Pine.LNX.4.63.0612071554180.28348@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: Commit f84871 breaks build on OS X","fromName":"Brian Gernhardt","fromEmail":"benji@silverinsanity.com","sentAt":"2006-12-07T15:29:16Z","receivedAt":"2006-12-07T15:29:16Z","isPatch":false,"sender":{"key":"benji@silverinsanity.com","avatar":"https://gravatar.com/avatar/e06c101dbc25c68114d859b4a9ec7cf8a2c52fd2b0270ef0eac0e2e63ff22311?d=mp&s=160"},"body":"Alex Riesen wrote:\n> Strange. You seem to have the old, generated Makefile you perl/\n> directory. Haven't your pull failed?\n\nMy pull didn't fail, and your suggested list of commands tells me \n\"Already up-to-date.\" I've pulled, reset, and removed perl/Makefile \nrepeatedly when I was trying to use git-bisect. Primarily because of \nmerge conflicts in perl/Makefile that running make causes.\n\nJohannes Schindeli wrote:\n>> When I pulled the most recent changes for git (de51faf), `make` began\n>> failing with the following messages: [...]\n>\n> I found the same, but could not reproduce it. But a \"touch perl/ \n> perl.mak\"\n> fixes at least compilation.\n\nIndeed, the following sequence works:\n\ngit reset --hard\ntouch perl/perl.mak\nmake\n\nBut this one doesn't:\n\ngit reset --hard\nmake\ntouch perl/perl.mak\nmake\n\nThat one fails with \"make[2]: *** No rule to make target \n`instlibdir'. Stop.\"\n\nAnd both of these sequences cause `git status` to report that \"perl/ \nMakefile\" has been changed, which doesn't seem ideal.\n\n(I'm replying to multiple messages because the list archive I'm \nbrowsing is getting the messages faster than I am, and I didn't feel \nthe need to wait.)\n\n"},{"id":"294359","messageId":"81b0412b0612070742x51af6011ua96962c53158cea0@mail.gmail.com","threadId":"43323","inReplyTo":"E8038C15-B359-4DE9-B3E0-45B065AEDBFA@silverinsanity.com","subject":"Re: Commit f84871 breaks build on OS X","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2006-12-07T15:42:40Z","receivedAt":"2006-12-07T15:42:40Z","isPatch":false,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"Does the attached patch help? I highly suspect the perl.mak generated\nby MakeMaker.\n\ndiff --git a/perl/Makefile b/perl/Makefile\nindex bd483b0..b936e0d 100644\n--- a/perl/Makefile\n+++ b/perl/Makefile\n@@ -29,6 +29,8 @@ $(makfile): ../GIT-CFLAGS Makefile\n \techo '\techo $(instdir_SQ)' >> $@\n else\n $(makfile): Makefile.PL ../GIT-CFLAGS\n+\t$(RM) $(makfile)\n+\t$(RM) $(makfile).old\n \t'$(PERL_PATH_SQ)' $< FIRST_MAKEFILE='$@' PREFIX='$(prefix_SQ)'\n endif\n\n\nFrom 5e00f865fa13a425d4395a70aaca798dfaf093dc Mon Sep 17 00:00:00 2001\nFrom: Alex Riesen \nDate: Thu, 7 Dec 2006 16:40:06 +0100\nSubject: [PATCH] workaround for MakeMaker-generated Makefiles\n\nIt seems to try to mv perl.mak into perl.mak.old file without checking if\n.old exists first.\n\nSigned-off-by: Alex Riesen \n\ndiff --git a/perl/Makefile b/perl/Makefile\nindex bd483b0..b936e0d 100644\n--- a/perl/Makefile\n+++ b/perl/Makefile\n@@ -29,6 +29,8 @@ $(makfile): ../GIT-CFLAGS Makefile\n \techo '\techo $(instdir_SQ)' >> $@\n else\n $(makfile): Makefile.PL ../GIT-CFLAGS\n+\t$(RM) $(makfile)\n+\t$(RM) $(makfile).old\n \t'$(PERL_PATH_SQ)' $< FIRST_MAKEFILE='$@' PREFIX='$(prefix_SQ)'\n endif\n \n"},{"id":"297764","messageId":"86ejrbihnr.fsf@blue.stonehenge.com","threadId":"43323","inReplyTo":"81b0412b0612070633i7aec43dse7a8beda64437103@mail.gmail.com","subject":"Re: Commit f84871 breaks build on OS X","fromName":"Randal L. Schwartz","fromEmail":"merlyn@stonehenge.com","sentAt":"2006-12-07T20:18:32Z","receivedAt":"2006-12-07T20:18:32Z","isPatch":false,"sender":{"key":"merlyn@stonehenge.com","avatar":"https://gravatar.com/avatar/dc528d210743ff0333e6213f9ee7b33b23f1b7bc1f3c5a8c2d819074ecd7ab19?d=mp&s=160"},"body":">>>>> \"Alex\" == Alex Riesen writes:\n\nAlex> Strange. You seem to have the old, generated Makefile you perl/\nAlex> directory. Haven't your pull failed? If so, I suspect that\n\nAlex> rm perl/Makefile\nAlex> git reset --hard\nAlex> git pull git...\n\nI ended up having to do another reset afterward.\n\nDefinitely something went weird when Makefile was removed\nfrom .gitignore.\n\n-- \nRandal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095\n \nPerl/Unix/security consulting, Technical writing, Comedy, etc. etc.\n"},{"id":"298136","messageId":"7vmz5zqqo7.fsf@assigned-by-dhcp.cox.net","threadId":"43323","inReplyTo":"86ejrbihnr.fsf@blue.stonehenge.com","subject":"Re: Commit f84871 breaks build on OS X","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-12-07T22:36:40Z","receivedAt":"2006-12-07T22:36:40Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"merlyn@stonehenge.com (Randal L. Schwartz) writes:\n\n>>>>>> \"Alex\" == Alex Riesen writes:\n>\n> Alex> Strange. You seem to have the old, generated Makefile you perl/\n> Alex> directory. Haven't your pull failed? If so, I suspect that\n>\n> Alex> rm perl/Makefile\n> Alex> git reset --hard\n> Alex> git pull git...\n>\n> I ended up having to do another reset afterward.\n>\n> Definitely something went weird when Makefile was removed\n> from .gitignore.\n\nYes, perl/Makefile is getting overwritten by what Makefile.PL\ngenerates. I thought the point of Alex's patch was to have it\nmuck with perl.mak and leave the tracked Makefile alone?\n\n"},{"id":"298647","messageId":"7virgnqpt5.fsf@assigned-by-dhcp.cox.net","threadId":"43323","inReplyTo":"7vmz5zqqo7.fsf@assigned-by-dhcp.cox.net","subject":"Re: Commit f84871 breaks build on OS X","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-12-07T22:55:18Z","receivedAt":"2006-12-07T22:55:18Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> merlyn@stonehenge.com (Randal L. Schwartz) writes:\n>\n>>>>>>> \"Alex\" == Alex Riesen writes:\n>>\n>> Alex> Strange. You seem to have the old, generated Makefile you perl/\n>> Alex> directory. Haven't your pull failed? If so, I suspect that\n>>\n>> Alex> rm perl/Makefile\n>> Alex> git reset --hard\n>> Alex> git pull git...\n>>\n>> I ended up having to do another reset afterward.\n>>\n>> Definitely something went weird when Makefile was removed\n>> from .gitignore.\n>\n> Yes, perl/Makefile is getting overwritten by what Makefile.PL\n> generates. I thought the point of Alex's patch was to have it\n> muck with perl.mak and leave the tracked Makefile alone?\n\nNow, I am CLUELESS about what MakeMaker does, but would this\nhelp?\n\n--- \ndiff --git a/perl/Makefile b/perl/Makefile\nindex bd483b0..099beda 100644\n--- a/perl/Makefile\n+++ b/perl/Makefile\n@@ -29,7 +29,7 @@ $(makfile): ../GIT-CFLAGS Makefile\n \techo '\techo $(instdir_SQ)' >> $@\n else\n $(makfile): Makefile.PL ../GIT-CFLAGS\n-\t'$(PERL_PATH_SQ)' $< FIRST_MAKEFILE='$@' PREFIX='$(prefix_SQ)'\n+\t'$(PERL_PATH_SQ)' $< PREFIX='$(prefix_SQ)'\n endif\n \n # this is just added comfort for calling make directly in perl dir\ndiff --git a/perl/Makefile.PL b/perl/Makefile.PL\nindex de73235..4168775 100644\n--- a/perl/Makefile.PL\n+++ b/perl/Makefile.PL\n@@ -24,5 +24,6 @@ WriteMakefile(\n \tNAME => 'Git',\n \tVERSION_FROM => 'Git.pm',\n \tPM\t\t=> \\%pm,\n+\tMAKEFILE\t=> 'perl.mak',\n \t%extra\n );\n\n"},{"id":"295883","messageId":"81b0412b0612072340w6af9df37y25a1d15773a3f8d8@mail.gmail.com","threadId":"43323","inReplyTo":"7virgnqpt5.fsf@assigned-by-dhcp.cox.net","subject":"Re: Commit f84871 breaks build on OS X","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2006-12-08T07:40:42Z","receivedAt":"2006-12-08T07:40:42Z","isPatch":false,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On 12/7/06, Junio C Hamano wrote:\n> >> Definitely something went weird when Makefile was removed\n> >> from .gitignore.\n> >\n> > Yes, perl/Makefile is getting overwritten by what Makefile.PL\n> > generates. I thought the point of Alex's patch was to have it\n> > muck with perl.mak and leave the tracked Makefile alone?\n>\n> Now, I am CLUELESS about what MakeMaker does, but would this\n> help?\n>\n\nMuch better.\nWorks here. Others?\n\n> diff --git a/perl/Makefile.PL b/perl/Makefile.PL\n> index de73235..4168775 100644\n> --- a/perl/Makefile.PL\n> +++ b/perl/Makefile.PL\n> @@ -24,5 +24,6 @@ WriteMakefile(\n> \tNAME => 'Git',\n> \tVERSION_FROM => 'Git.pm',\n> \tPM\t\t=> \\%pm,\n> +\tMAKEFILE\t=> 'perl.mak',\n> \t%extra\n> );\n\nI should have read the FS of that MakeMaker.pm,\n"},{"id":"295017","messageId":"2EB26FE2-C6AC-4C2E-9586-AD43B1E05175@silverinsanity.com","threadId":"43323","inReplyTo":"81b0412b0612072340w6af9df37y25a1d15773a3f8d8@mail.gmail.com","subject":"Re: Commit f84871 breaks build on OS X","fromName":"Brian Gernhardt","fromEmail":"benji@silverinsanity.com","sentAt":"2006-12-08T11:51:08Z","receivedAt":"2006-12-08T11:51:08Z","isPatch":false,"sender":{"key":"benji@silverinsanity.com","avatar":"https://gravatar.com/avatar/e06c101dbc25c68114d859b4a9ec7cf8a2c52fd2b0270ef0eac0e2e63ff22311?d=mp&s=160"},"body":"On Dec 8, 2006, at 2:40 AM, Alex Riesen wrote:\n>> Now, I am CLUELESS about what MakeMaker does, but would this\n>> help?\n>\n> Much better.\n> Works here. Others?\n\nPerfect!\n\n"}]}