components/git/patches/perl_Makefile.patch
branchs11u3-sru
changeset 5720 519e1bb835ee
parent 731 2a19ec4c0d8f
--- a/components/git/patches/perl_Makefile.patch	Sat Apr 02 01:55:18 2016 +0100
+++ b/components/git/patches/perl_Makefile.patch	Thu Mar 24 11:12:03 2016 -0700
@@ -1,28 +1,14 @@
---- git-1.7.9.2/perl/Makefile.~1~	Wed Feb 22 18:04:18 2012
-+++ git-1.7.9.2/perl/Makefile	Fri Mar  2 14:51:25 2012
-@@ -21,20 +21,18 @@
- 	$(RM) $(makfile).old
- 
- ifdef NO_PERL_MAKEMAKER
--instdir_SQ = $(subst ','\'',$(prefix)/lib)
-+instdir_SQ = $(subst ','\'',$$(PERL_LIB))
- $(makfile): ../GIT-CFLAGS Makefile
- 	echo all: private-Error.pm Git.pm > $@
- 	echo '	mkdir -p blib/lib' >> $@
- 	echo '	$(RM) blib/lib/Git.pm; cp Git.pm blib/lib/' >> $@
- 	echo '	$(RM) blib/lib/Error.pm' >> $@
--	'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
- 	echo '	cp private-Error.pm blib/lib/Error.pm' >> $@
- 	echo install: >> $@
--	echo '	mkdir -p "$$(DESTDIR)$(instdir_SQ)"' >> $@
--	echo '	$(RM) "$$(DESTDIR)$(instdir_SQ)/Git.pm"; cp Git.pm "$$(DESTDIR)$(instdir_SQ)"' >> $@
--	echo '	$(RM) "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@
--	'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
--	echo '	cp private-Error.pm "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@
-+	echo '	mkdir -p "$$(DESTDIR)/$(instdir_SQ)"' >> $@
-+	echo '	$(RM) "$$(DESTDIR)/$(instdir_SQ)/Git.pm"; cp Git.pm "$$(DESTDIR)/$(instdir_SQ)"' >> $@
-+	echo '	$(RM) "$$(DESTDIR)/$(instdir_SQ)/Error.pm"' >> $@
-+	echo '	cp private-Error.pm "$$(DESTDIR)/$(instdir_SQ)/Error.pm"' >> $@
- 	echo instlibdir: >> $@
+Make sure that the vendor pattern for installation is passed through to
+MakeMaker.  This is not suitable for upstream.
+
+--- git-2.4.5/perl/Makefile	Thu Jun 25 12:15:40 2015
++++ git-2.4.5/perl/Makefile	Sat Jul  4 11:32:21 2015
+@@ -80,7 +80,7 @@
  	echo '	echo $(instdir_SQ)' >> $@
  else
+ $(makfile): Makefile.PL ../GIT-CFLAGS
+-	$(PERL_PATH) $< PREFIX='$(prefix_SQ)' INSTALL_BASE='' --localedir='$(localedir_SQ)'
++	$(PERL_PATH) $< PREFIX='$(prefix_SQ)' INSTALL_BASE='' --localedir='$(localedir_SQ)' INSTALLDIRS=vendor
+ endif
+ 
+ # this is just added comfort for calling make directly in perl dir