commit: 366705970a7887e22b257e7ed185c62ff8e5e165 Author: Kent Fredric <kentnl <AT> gentoo <DOT> org> AuthorDate: Sat Oct 7 22:51:08 2017 +0000 Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org> CommitDate: Sat Oct 7 22:52:47 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36670597
dev-perl/Devel-SmallProf: Fix perl 5.26 support re bug #615590 - Runtime code for .smallprof file loading changed needing rbump - Tests patched for loading with new "do" syntax. Bug: https://bugs.gentoo.org/615590 Package-Manager: Portage-2.3.8, Repoman-2.3.3 .../Devel-SmallProf-2.20.0-r3.ebuild | 22 +++++++ .../files/Devel-SmallProf-2.20.0-perl526.patch | 67 ++++++++++++++++++++++ 2 files changed, 89 insertions(+) diff --git a/dev-perl/Devel-SmallProf/Devel-SmallProf-2.20.0-r3.ebuild b/dev-perl/Devel-SmallProf/Devel-SmallProf-2.20.0-r3.ebuild new file mode 100644 index 00000000000..4dd621fc738 --- /dev/null +++ b/dev-perl/Devel-SmallProf/Devel-SmallProf-2.20.0-r3.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DIST_AUTHOR=SALVA +DIST_VERSION=2.02 +inherit perl-module + +DESCRIPTION="Per-line Perl profiler" + +SLOT="0" +KEYWORDS="~amd64 ~sparc ~x86" +IUSE="" + +PATCHES=( + "${FILESDIR}/${P}-defined.patch" + "${FILESDIR}/${P}-perl526.patch" +) +# note: dont use parallel here +# tests need each others exit state +DIST_TEST="do" diff --git a/dev-perl/Devel-SmallProf/files/Devel-SmallProf-2.20.0-perl526.patch b/dev-perl/Devel-SmallProf/files/Devel-SmallProf-2.20.0-perl526.patch new file mode 100644 index 00000000000..538387562a6 --- /dev/null +++ b/dev-perl/Devel-SmallProf/files/Devel-SmallProf-2.20.0-perl526.patch @@ -0,0 +1,67 @@ +From 70d450555b1792530c4230cecf84a044b2c3f9ce Mon Sep 17 00:00:00 2001 +From: Kent Fredric <[email protected]> +Date: Sun, 8 Oct 2017 11:45:25 +1300 +Subject: Fix Perl 5.26 support without '.' in @INC + +1. Tests rely on "do $LOCALFILE" syntax +2. Runtime conditionally can load a local file ('./.smallprof') + +Bug: https://bugs.gentoo.org/615590 +Bug: https://rt.cpan.org/Ticket/Display.html?id=121134 +--- + lib/Devel/SmallProf.pm | 4 ++-- + t/part1.t | 2 +- + t/part2.t | 2 +- + t/part3.t | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/Devel/SmallProf.pm b/lib/Devel/SmallProf.pm +index 2b5d091..4fdd66a 100644 +--- a/lib/Devel/SmallProf.pm ++++ b/lib/Devel/SmallProf.pm +@@ -55,8 +55,8 @@ BEGIN { + $drop_zeros = 0; + $profile = 1; + $grep_format = 0; +- if (-e '.smallprof') { +- do '.smallprof'; ++ if (-e './.smallprof') { ++ do './.smallprof'; + } + my $env=$ENV{SMALLPROF_CONFIG}||''; + $drop_zeros = 1 if $env=~/z/; +diff --git a/t/part1.t b/t/part1.t +index 805ebe4..483f203 100644 +--- a/t/part1.t ++++ b/t/part1.t +@@ -6,4 +6,4 @@ + # doesn't have it's contents put into the symbol table. Thus this shim which + # invokes the real part1 so that its contents are visible. + +-do 't/part1.b' or die "$!"; ++do './t/part1.b' or die "$!"; +diff --git a/t/part2.t b/t/part2.t +index c808010..335d032 100644 +--- a/t/part2.t ++++ b/t/part2.t +@@ -9,7 +9,7 @@ unless (open(OUT,'smallprof.out')) { + undef $/; + $_ = <OUT>; + close OUT; +-print +(/Profile of \(eval/ && m!Profile of t.part1\.b!) ++print +(/Profile of \(eval/ && m!Profile of \./t.part1\.b!) + ? "ok 1\n" : "not ok 1\n"; + my (@matches) = /Profile of/g; + print +(@matches == 3) ? "ok 2\n" : "not ok 2\n"; +diff --git a/t/part3.t b/t/part3.t +index 652b306..135d4ca 100644 +--- a/t/part3.t ++++ b/t/part3.t +@@ -1,3 +1,3 @@ + #!perl -d:SmallProf + +-do 't/part3.b' or die "$!"; ++do './t/part3.b' or die "$!"; +-- +2.14.1 +
