{"thread":{"id":"35346","subject":"[PATCH 0/2] add PERLLIB_EXTRA to add to default perl path","startedAt":"2013-11-15T21:06:04Z","lastAt":"2013-11-18T22:23:11Z","messageCount":4,"participants":["Jonathan Nieder"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"230687","messageId":"20131115210604.GC27781@google.com","threadId":"35346","inReplyTo":null,"subject":"[PATCH 0/2] add PERLLIB_EXTRA to add to default perl path","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-11-15T21:06:04Z","receivedAt":"2013-11-15T21:06:04Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"A small pair of patches, for your enjoyment.\n\nThoughts?\n\nJonathan Nieder (2):\n Makefile: rebuild perl scripts when perl paths change\n Makefile: add PERLLIB_EXTRA variable that adds to default perl path\n\n Makefile | 16 ++++++++++++++--\n 1 file changed, 14 insertions(+), 2 deletions(-)\n"},{"id":"230688","messageId":"20131115210949.GD27781@google.com","threadId":"35346","inReplyTo":"20131115210604.GC27781@google.com","subject":"[PATCH 1/2] Makefile: rebuild perl scripts when perl paths change","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-11-15T21:09:49Z","receivedAt":"2013-11-15T21:09:49Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Signed-off-by: Jonathan Nieder \n---\n Makefile | 13 +++++++++++--\n 1 file changed, 11 insertions(+), 2 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex af847f8..e5e7868 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1792,7 +1792,8 @@ perl/PM.stamp: FORCE\n perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL\n \t$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)\n \n-$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE\n+PERL_DEFINES = $(PERL_PATH_SQ)\n+$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE\n \t$(QUIET_GEN)$(RM) $@ $@+ && \\\n \tINSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \\\n \tsed -e '1{' \\\n@@ -1807,6 +1808,13 @@ $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE\n \tchmod +x $@+ && \\\n \tmv $@+ $@\n \n+GIT-PERL-DEFINES: FORCE\n+\t@FLAGS='$(PERL_DEFINES)'; \\\n+\t if test x\"$$FLAGS\" != x\"`cat $@ 2>/dev/null`\" ; then \\\n+\t\techo >&2 \" * new perl-specific parameters\"; \\\n+\t\techo \"$$FLAGS\" >$@; \\\n+\t fi\n+\n \n .PHONY: gitweb\n gitweb:\n@@ -2494,7 +2502,8 @@ ifndef NO_TCLTK\n \t$(MAKE) -C git-gui clean\n endif\n \t$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-BUILD-OPTIONS\n-\t$(RM) GIT-USER-AGENT GIT-PREFIX GIT-SCRIPT-DEFINES GIT-PYTHON-VARS\n+\t$(RM) GIT-USER-AGENT GIT-PREFIX\n+\t$(RM) GIT-SCRIPT-DEFINES GIT-PERL-DEFINES GIT-PYTHON-VARS\n \n .PHONY: all install profile-clean clean strip\n .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell\n-- \n1.8.4.1\n"},{"id":"230689","messageId":"20131115211028.GE27781@google.com","threadId":"35346","inReplyTo":"20131115210604.GC27781@google.com","subject":"[PATCH 2/2] Makefile: add PERLLIB_EXTRA variable that adds to default perl path","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-11-15T21:10:28Z","receivedAt":"2013-11-15T21:10:28Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Some platforms ship Perl modules used by git scripts outside the\ndefault perl path (e.g., on Mac OS X, Subversion's perl bindings live\nin a separate xcode perl path). Add an PERLLIB_EXTRA variable to hold\na colon-separated list of extra directories to add to the perl path in\ngit's scripts, as a convenience for packagers.\n\nRequested-by: Dave Borowitz \nSigned-off-by: Jonathan Nieder \n---\nThanks for reading.\n\n Makefile | 5 ++++-\n 1 file changed, 4 insertions(+), 1 deletion(-)\n\ndiff --git a/Makefile b/Makefile\nindex e5e7868..67f1754 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1588,6 +1588,7 @@ PERL_PATH_SQ = $(subst ','\\'',$(PERL_PATH))\n PYTHON_PATH_SQ = $(subst ','\\'',$(PYTHON_PATH))\n TCLTK_PATH_SQ = $(subst ','\\'',$(TCLTK_PATH))\n DIFF_SQ = $(subst ','\\'',$(DIFF))\n+PERLLIB_EXTRA_SQ = $(subst ','\\'',$(PERLLIB_EXTRA))\n \n LIBS = $(GITLIBS) $(EXTLIBS)\n \n@@ -1792,10 +1793,12 @@ perl/PM.stamp: FORCE\n perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL\n \t$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)\n \n-PERL_DEFINES = $(PERL_PATH_SQ)\n+PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ)\n $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE\n \t$(QUIET_GEN)$(RM) $@ $@+ && \\\n \tINSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \\\n+\tINSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \\\n+\tINSTLIBDIR=\"$$INSTLIBDIR$${INSTLIBDIR_EXTRA:+:$$INSTLIBDIR_EXTRA}\" && \\\n \tsed -e '1{' \\\n \t -e '\ts|#!.*perl|#!$(PERL_PATH_SQ)|' \\\n \t -e '\th' \\\n-- \n1.8.4.1\n"},{"id":"230786","messageId":"20131118222311.GL27781@google.com","threadId":"35346","inReplyTo":"20131115210949.GD27781@google.com","subject":"[PATCH 1/2 v2] Makefile: rebuild perl scripts when perl paths change","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-11-18T22:23:11Z","receivedAt":"2013-11-18T22:23:11Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Signed-off-by: Jonathan Nieder \n---\nChange since v1:\n- add GIT-PERL-DEFINES to .gitignore so it doesn't clutter up\n \"git status\" output\n\n .gitignore | 1 +\n Makefile | 13 +++++++++++--\n 2 files changed, 12 insertions(+), 2 deletions(-)\n\ndiff --git a/.gitignore b/.gitignore\nindex 66199ed..a78367c 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -2,6 +2,7 @@\n /GIT-CFLAGS\n /GIT-LDFLAGS\n /GIT-PREFIX\n+/GIT-PERL-DEFINES\n /GIT-PYTHON-VARS\n /GIT-SCRIPT-DEFINES\n /GIT-USER-AGENT\ndiff --git a/Makefile b/Makefile\nindex af847f8..e5e7868 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1792,7 +1792,8 @@ perl/PM.stamp: FORCE\n perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL\n \t$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)\n \n-$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE\n+PERL_DEFINES = $(PERL_PATH_SQ)\n+$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE\n \t$(QUIET_GEN)$(RM) $@ $@+ && \\\n \tINSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \\\n \tsed -e '1{' \\\n@@ -1807,6 +1808,13 @@ $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE\n \tchmod +x $@+ && \\\n \tmv $@+ $@\n \n+GIT-PERL-DEFINES: FORCE\n+\t@FLAGS='$(PERL_DEFINES)'; \\\n+\t if test x\"$$FLAGS\" != x\"`cat $@ 2>/dev/null`\" ; then \\\n+\t\techo >&2 \" * new perl-specific parameters\"; \\\n+\t\techo \"$$FLAGS\" >$@; \\\n+\t fi\n+\n \n .PHONY: gitweb\n gitweb:\n@@ -2494,7 +2502,8 @@ ifndef NO_TCLTK\n \t$(MAKE) -C git-gui clean\n endif\n \t$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-BUILD-OPTIONS\n-\t$(RM) GIT-USER-AGENT GIT-PREFIX GIT-SCRIPT-DEFINES GIT-PYTHON-VARS\n+\t$(RM) GIT-USER-AGENT GIT-PREFIX\n+\t$(RM) GIT-SCRIPT-DEFINES GIT-PERL-DEFINES GIT-PYTHON-VARS\n \n .PHONY: all install profile-clean clean strip\n .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell\n-- \n1.8.4.1\n"}]}