Date: Thursday, April 19, 2018 @ 07:26:05 Author: eworm Revision: 322195
use upstream fix Added: git/trunk/0001-perl-fix-installing-modules-from-contrib.patch Modified: git/trunk/PKGBUILD -----------------------------------------------------+ 0001-perl-fix-installing-modules-from-contrib.patch | 48 ++++++++++++++++++ PKGBUILD | 6 +- 2 files changed, 53 insertions(+), 1 deletion(-) Added: 0001-perl-fix-installing-modules-from-contrib.patch =================================================================== --- 0001-perl-fix-installing-modules-from-contrib.patch (rev 0) +++ 0001-perl-fix-installing-modules-from-contrib.patch 2018-04-19 07:26:05 UTC (rev 322195) @@ -0,0 +1,48 @@ +From cfb3a47cada99d1bdccd08426f122ded2a63834e Mon Sep 17 00:00:00 2001 +From: Christian Hesse <[email protected]> +Date: Tue, 10 Apr 2018 15:36:41 +0200 +Subject: perl: fix installing modules from contrib + +Commit 20d2a30f (Makefile: replace perl/Makefile.PL with simple make rules) +removed a target that allowed Makefiles from contrib/ to get the correct +install path. This introduces a new target for main Makefile and fixes +installation for Mediawiki module. + +v2: Pass prefix as that can have influence as well, add single quotes + for _SQ variant. + +Signed-off-by: Christian Hesse <[email protected]> +--- + Makefile | 2 ++ + contrib/mw-to-git/Makefile | 5 +++-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 2091f5f892..75b9ad3b48 100644 +--- a/Makefile ++++ b/Makefile +@@ -1973,6 +1973,8 @@ GIT-PERL-DEFINES: FORCE + echo "$$FLAGS" >$@; \ + fi + ++perllibdir: ++ @echo '$(perllibdir_SQ)' + + .PHONY: gitweb + gitweb: +diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile +index a4b6f7a2cd..4e603512a3 100644 +--- a/contrib/mw-to-git/Makefile ++++ b/contrib/mw-to-git/Makefile +@@ -21,8 +21,9 @@ HERE=contrib/mw-to-git/ + INSTALL = install + + SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL)) +-INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \ +- -s --no-print-directory instlibdir) ++INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/ \ ++ -s --no-print-directory prefix=$(prefix) \ ++ perllibdir=$(perllibdir) perllibdir) + DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) + INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR)) + Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-04-18 22:46:32 UTC (rev 322194) +++ PKGBUILD 2018-04-19 07:26:05 UTC (rev 322195) @@ -28,11 +28,13 @@ install=git.install validpgpkeys=('96E07AF25771955980DAD10020D04E5A713660A7') # Junio C Hamano source=("https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar."{xz,sign} + '0001-perl-fix-installing-modules-from-contrib.patch' '[email protected]' 'git-daemon.socket' 'git-sysusers.conf') sha256sums=('e916e5e95e81dbeafa7aac5d719c01108b5c814eb90b746695afa1afedf955c7' 'SKIP' + 'c105015d2e5e4e671cb766edf4169e853021b07296e6d449b3209b4de7848afc' '14c0b67cfe116b430645c19d8c4759419657e6809dfa28f438c33a005245ad91' 'ac4c90d62c44926e6d30d18d97767efc901076d4e0283ed812a349aece72f203' '7630e8245526ad80f703fac9900a1328588c503ce32b37b9f8811674fcda4a45') @@ -56,6 +58,9 @@ export PYTHON_PATH='/usr/bin/python2' cd "$srcdir/$pkgname-$pkgver" + # perl: fix installing modules from contrib + patch -Np1 < ../0001-perl-fix-installing-modules-from-contrib.patch + make \ "${make_paths[@]}" \ "${make_options[@]}" \ @@ -120,7 +125,6 @@ make -C contrib/subtree "${make_paths[@]}" DESTDIR="$pkgdir" install install-doc # mediawiki installation make -C contrib/mw-to-git "${make_paths[@]}" DESTDIR="$pkgdir" install - mv "$pkgdir"/Git/Mediawiki.pm "$pkgdir"/usr/share/perl5/vendor_perl/Git/ && rmdir "$pkgdir"/Git # TODO: fix install path! # the rest of the contrib stuff find contrib/ -name '.gitignore' -delete cp -a ./contrib/* $pkgdir/usr/share/git/
