public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Devel-SmallProf/, dev-perl/Devel-SmallProf/files/
@ 2017-10-07 22:53 Kent Fredric
  0 siblings, 0 replies; 2+ messages in thread
From: Kent Fredric @ 2017-10-07 22:53 UTC (permalink / raw
  To: gentoo-commits

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 <kentnl@gentoo.org>
+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
+


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Devel-SmallProf/, dev-perl/Devel-SmallProf/files/
@ 2019-05-17 21:18 Andreas K. Hüttel
  0 siblings, 0 replies; 2+ messages in thread
From: Andreas K. Hüttel @ 2019-05-17 21:18 UTC (permalink / raw
  To: gentoo-commits

commit:     1ac951ab7b0ef38f9c851e9588e407c147ef05ff
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 21:18:05 2019 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri May 17 21:18:30 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ac951ab

dev-perl/Devel-SmallProf: Add perl-5.28 patch from RH

Closes: https://bugs.gentoo.org/661204
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 .../Devel-SmallProf-2.20.0-r4.ebuild               | 23 ++++++++++++
 .../files/Devel-SmallProf-2.20.0-perl528.patch     | 42 ++++++++++++++++++++++
 2 files changed, 65 insertions(+)

diff --git a/dev-perl/Devel-SmallProf/Devel-SmallProf-2.20.0-r4.ebuild b/dev-perl/Devel-SmallProf/Devel-SmallProf-2.20.0-r4.ebuild
new file mode 100644
index 00000000000..cf2637c44aa
--- /dev/null
+++ b/dev-perl/Devel-SmallProf/Devel-SmallProf-2.20.0-r4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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"
+	"${FILESDIR}/${P}-perl528.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-perl528.patch b/dev-perl/Devel-SmallProf/files/Devel-SmallProf-2.20.0-perl528.patch
new file mode 100644
index 00000000000..3417fa00327
--- /dev/null
+++ b/dev-perl/Devel-SmallProf/files/Devel-SmallProf-2.20.0-perl528.patch
@@ -0,0 +1,42 @@
+From fd31925e40127b2f45518efbcee60ae7f2da30ae Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Fri, 29 Jun 2018 13:27:51 +0200
+Subject: [PATCH] Remove DB::sub declaration
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Tests fail with Perl 5.28.0:
+
+t/part1.t .. No DB::sub routine defined at t/part1.t line 1.
+BEGIN failed--compilation aborted at t/part1.t line 2.
+
+SmallProf.pm contains DB::sub declaration without a
+corresponding definition with an exaplanation "even if it
+is not used it has to be declared!"
+
+If I remove the declaration, tests pass. Tests pass even on Perl
+5.26.2. It seems the hack is not needed anymore and it is even
+harmfull to Perl 5.28.0.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ lib/Devel/SmallProf.pm | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/lib/Devel/SmallProf.pm b/lib/Devel/SmallProf.pm
+index 4fdd66a..63a94a6 100644
+--- a/lib/Devel/SmallProf.pm
++++ b/lib/Devel/SmallProf.pm
+@@ -16,8 +16,6 @@ our ($profile, $drop_zeros, $grep_format, %packages);
+ my ($cdone, $done, $cstart, $start, $prevf, $prevl, $nulltime,
+     %listings, %profiles, %times, %ctimes);
+ 
+-sub sub; # even if it is not used it has to be declared!
+-
+ sub DB {
+   $profile || return;
+ 
+-- 
+2.14.4
+


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-05-17 21:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-17 21:18 [gentoo-commits] repo/gentoo:master commit in: dev-perl/Devel-SmallProf/, dev-perl/Devel-SmallProf/files/ Andreas K. Hüttel
  -- strict thread matches above, loose matches on Subject: below --
2017-10-07 22:53 Kent Fredric

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox