From: Junio C Hamano Date: Tue, 13 Feb 2018 21:39:03 +0000 (-0800) Subject: Merge branch 'ab/simplify-perl-makefile' X-Git-Tag: v2.17.0-rc0~134 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed1b87ef910fe38dfb9cf044f5c946adfab0c5e3;p=thirdparty%2Fgit.git Merge branch 'ab/simplify-perl-makefile' The build procedure for perl/ part has been greatly simplified by weaning ourselves off of MakeMaker. * ab/simplify-perl-makefile: perl: treat PERLLIB_EXTRA as an extra path again perl: avoid *.pmc and fix Error.pm further Makefile: replace perl/Makefile.PL with simple make rules --- ed1b87ef910fe38dfb9cf044f5c946adfab0c5e3 diff --cc t/perf/aggregate.perl index 5c439f6bc2,923044df6a..3a0917fa61 --- a/t/perf/aggregate.perl +++ b/t/perf/aggregate.perl @@@ -1,9 -1,8 +1,9 @@@ #!/usr/bin/perl - use lib '../../perl/blib/lib'; + use lib '../../perl/build/lib'; use strict; use warnings; +use JSON; use Git; sub get_times {