summarylogtreecommitdiffstats
path: root/0001-Perl-5.21.4-compatibility.patch
diff options
context:
space:
mode:
authorJohn D Jones III2016-04-24 13:00:43 -0600
committerJohn D Jones III2016-04-24 13:00:43 -0600
commit532582a2dcf8608a38d97a9481075f4e2a7f3df2 (patch)
tree2efa688eeef5e01b43df84741076d4a216d5088e /0001-Perl-5.21.4-compatibility.patch
parent9c6f2f2b0032869b5da0d49c6d5b482172fcd2bf (diff)
downloadaur-perl-b-hooks-op-check-entersubforcv.tar.gz
Add patch to make this build
Diffstat (limited to '0001-Perl-5.21.4-compatibility.patch')
-rw-r--r--0001-Perl-5.21.4-compatibility.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/0001-Perl-5.21.4-compatibility.patch b/0001-Perl-5.21.4-compatibility.patch
new file mode 100644
index 000000000000..0880cb1f7d49
--- /dev/null
+++ b/0001-Perl-5.21.4-compatibility.patch
@@ -0,0 +1,34 @@
+From 6c62adb1722a96370dbe8d294d36f9382b0788fa Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Sun, 27 Dec 2015 11:47:24 +0200
+Subject: [PATCH] Perl >= 5.21.4 compatibility
+
+This fixes test failures since perl commit v5.21.3-654-ga65cc14 .
+
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=94945
+Bug-Debian: https://bugs.debian.org/787499
+---
+ EntersubForCV.xs | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/EntersubForCV.xs b/EntersubForCV.xs
+index 870d470..4acbcab 100644
+--- a/EntersubForCV.xs
++++ b/EntersubForCV.xs
+@@ -60,7 +60,12 @@ entersub_cb (pTHX_ OP *op, void *user_data) {
+ return op;
+ }
+
+- cv = GvCV (cGVOPx_gv (kid));
++ GV *gv = cGVOPx_gv (kid);
++ if (SvROK(gv)) { /* since v5.21.3-654-ga65cc14 */
++ cv = (CV *)SvRV(gv);
++ } else {
++ cv = GvCV (gv);
++ }
+
+ if (ud->cv == cv) {
+ op = ud->cb (aTHX_ op, cv, ud->ud);
+--
+2.6.4
+