{"thread":{"id":"4790","subject":"[PATCH] Fix compilation","startedAt":"2006-07-06T23:21:57Z","lastAt":"2006-07-08T02:04:47Z","messageCount":4,"participants":["Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"23337","messageId":"Pine.LNX.4.63.0607070120590.29667@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"4790","inReplyTo":null,"subject":"[PATCH] Fix compilation","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-07-06T23:21:57Z","receivedAt":"2006-07-06T23:21:57Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nWithout this, make 3.79.1 (Darwin) says\n\nrm -f git-archimport git-archimport+\nINSTLIBDIR=`make -C perl -s --no-print-directory instlibdir` && \\\nsed -e '1s|#!.*perl|#!/usr/bin/perl|1' \\\n -e '2i\\\n use lib (split(/:/, $ENV{GITPERLLIB} || '\\'\"$INSTLIBDIR\"\\''));' \\\n -e 's|@@INSTLIBDIR@@|'\"$INSTLIBDIR\"'|g' \\\n -e 's/@@GIT_VERSION@@/1.4.1.gb564-dirty/g' \\\n git-archimport.perl >git-archimport+\nsed: 1: \"2i use lib (split(/:/, ...\": command i expects \\ followed by text\n\nSigned-off-by: Johannes Schindelin \n\n---\n\n\tNote that this just fixes compilation, not the tests. All of\n\ta sudden, I have to install Scalar::Util, where things were\n\tfine before Git.pm.\n\n\tNote also, that this patch relies on the perl scripts not\n\tcaring if an additional command is shifted into the 2nd line.\n\tI checked all of them, and they don't.\n\n Makefile | 3 +--\n 1 files changed, 1 insertions(+), 2 deletions(-)\n\ndiff --git a/Makefile b/Makefile\n--- a/Makefile\n+++ b/Makefile\n@@ -563,8 +563,7 @@ common-cmds.h: Documentation/git-*.txt\n \trm -f $@ $@+\n \tINSTLIBDIR=`$(MAKE) -C perl -s --no-print-directory instlibdir` && \\\n \tsed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|1' \\\n-\t -e '2i\\\n-\t use lib (split(/:/, $$ENV{GITPERLLIB} || '\\'\"$$INSTLIBDIR\"\\''));' \\\n+\t -e \"2s=^=use lib (split(/:/, \\$$ENV{GITPERLLIB} || \\'$$INSTLIBDIR\\')); =g\" \\\n \t -e 's|@@INSTLIBDIR@@|'\"$$INSTLIBDIR\"'|g' \\\n \t -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \\\n \t $@.perl >$@+\n"},{"id":"23339","messageId":"7vmzbm46e4.fsf@assigned-by-dhcp.cox.net","threadId":"4790","inReplyTo":"Pine.LNX.4.63.0607070120590.29667@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: [PATCH] Fix compilation","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-07-07T00:15:31Z","receivedAt":"2006-07-07T00:15:31Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> Without this, make 3.79.1 (Darwin) says\n>\n> rm -f git-archimport git-archimport+\n> INSTLIBDIR=`make -C perl -s --no-print-directory instlibdir` && \\\n> sed -e '1s|#!.*perl|#!/usr/bin/perl|1' \\\n> -e '2i\\\n> use lib (split(/:/, $ENV{GITPERLLIB} || '\\'\"$INSTLIBDIR\"\\''));' \\\n> -e 's|@@INSTLIBDIR@@|'\"$INSTLIBDIR\"'|g' \\\n> -e 's/@@GIT_VERSION@@/1.4.1.gb564-dirty/g' \\\n> git-archimport.perl >git-archimport+\n> sed: 1: \"2i use lib (split(/:/, ...\": command i expects \\ followed by text\n>\n> Signed-off-by: Johannes Schindelin \n\nTraditionally 'i' and 'a' command to sed has been unfriendly\nwith make, primarily because different make implementations did\nunexpected things to backslashes at the end of lines.\n\nFor portability I would even suggest making that command into a\nseparate helper shell script, and call that from the Makefile.\n\n> \tNote that this just fixes compilation, not the tests. All of\n> \ta sudden, I have to install Scalar::Util, where things were\n> \tfine before Git.pm.\n\nI recall Pasky talking about Scalar::Util removal and I thought\nI took a patch.\n\n ... goes \"git grep\" ...\n\nAh the private edition of Error.pm pulls that in. Sheesh.\n"},{"id":"23394","messageId":"7vbqs1w5d0.fsf@assigned-by-dhcp.cox.net","threadId":"4790","inReplyTo":"Pine.LNX.4.63.0607070120590.29667@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: [PATCH] Fix compilation","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-07-07T20:02:35Z","receivedAt":"2006-07-07T20:02:35Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> \tNote also, that this patch relies on the perl scripts not\n> \tcaring if an additional command is shifted into the 2nd line.\n\nHow about doing something like this instead, then?\n\ndiff --git a/Makefile b/Makefile\nindex 71657ec..01b9a94 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -550,9 +550,13 @@ common-cmds.h: Documentation/git-*.txt\n $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl\n \trm -f $@ $@+\n \tINSTLIBDIR=`$(MAKE) -C perl -s --no-print-directory instlibdir` && \\\n-\tsed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|1' \\\n-\t -e '2i\\\n-\t use lib (split(/:/, $$ENV{GITPERLLIB} || '\\'\"$$INSTLIBDIR\"\\''));' \\\n+\tsed -e '1{' \\\n+\t -e '\ts|#!.*perl|#!$(PERL_PATH_SQ)|' \\\n+\t -e '\th' \\\n+\t -e '\ts=.*=use lib (split(/:/, $$ENV{GITPERLLIB} || \"@@INSTLIBDIR@@\"));=' \\\n+\t -e '\tH' \\\n+\t -e '\tx' \\\n+\t -e '}' \\\n \t -e 's|@@INSTLIBDIR@@|'\"$$INSTLIBDIR\"'|g' \\\n \t -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \\\n \t $@.perl >$@+\n"},{"id":"23400","messageId":"Pine.LNX.4.63.0607080403470.29667@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"4790","inReplyTo":"7vbqs1w5d0.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] Fix compilation","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-07-08T02:04:47Z","receivedAt":"2006-07-08T02:04:47Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 7 Jul 2006, Junio C Hamano wrote:\n\n> Johannes Schindelin writes:\n> \n> > \tNote also, that this patch relies on the perl scripts not\n> > \tcaring if an additional command is shifted into the 2nd line.\n> \n> How about doing something like this instead, then?\n\nI will try as soon as possible. ATM my iBook is in my car, which I had to \nleave at a friend's place, because said friend sensibly refused to let me \ndrive.\n\nCiao,\nDscho\n"}]}