diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2017-06-25 23:58:41 +0200 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2017-06-25 23:58:58 +0200 |
| commit | c0d8b207d29614a6a5c19108d30176a7e6eae3c7 (patch) | |
| tree | ccb3322a7e6157ead51c0b8284d764d28aa89b99 /dev-perl/Coro | |
| parent | dev-libs/xmlsec: version bump (diff) | |
| download | gentoo-c0d8b207d29614a6a5c19108d30176a7e6eae3c7.tar.gz gentoo-c0d8b207d29614a6a5c19108d30176a7e6eae3c7.tar.bz2 gentoo-c0d8b207d29614a6a5c19108d30176a7e6eae3c7.zip | |
dev-perl/Coro: Add Perl 5.26 compatibility patch, bug 615520
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Diffstat (limited to 'dev-perl/Coro')
| -rw-r--r-- | dev-perl/Coro/Coro-6.511.0.ebuild | 7 | ||||
| -rw-r--r-- | dev-perl/Coro/files/6.511.0-padoffset.patch | 60 |
2 files changed, 64 insertions, 3 deletions
diff --git a/dev-perl/Coro/Coro-6.511.0.ebuild b/dev-perl/Coro/Coro-6.511.0.ebuild index 1b4a7fa092f5..1be8e564e4bc 100644 --- a/dev-perl/Coro/Coro-6.511.0.ebuild +++ b/dev-perl/Coro/Coro-6.511.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -27,9 +27,10 @@ DEPEND="${RDEPEND} src_prepare() { if ! use vanilla; then - ewarn "This release includes a 3rd party argarray patch for Perl 5.24 Compat." - ewarn "Please do not contact upstream directly regarding problems arising from this." + elog "This release includes 3rd party patches for Perl 5.24 and 5.26 compatibility." + elog "Please do not contact upstream directly regarding problems arising from this." eapply "${FILESDIR}/${PV}-argarray.patch" + eapply "${FILESDIR}/${PV}-padoffset.patch" fi perl-module_src_prepare } diff --git a/dev-perl/Coro/files/6.511.0-padoffset.patch b/dev-perl/Coro/files/6.511.0-padoffset.patch new file mode 100644 index 000000000000..2fb34c0791be --- /dev/null +++ b/dev-perl/Coro/files/6.511.0-padoffset.patch @@ -0,0 +1,60 @@ +From b48bc3a8141e5f27ce48b6f3ebbe2ba6ee7bda94 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> +Date: Tue, 23 May 2017 15:12:06 +0200 +Subject: [PATCH] Adjust comppad_name_ variable sizes to Perl 5.26.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Perl 5.26.0 changed some variable types in this commit: + +commit d12be05dd0210a08e077f0cc9586a5a963122547 +Author: David Mitchell <davem@iabyn.com> +Date: Mon Sep 26 15:56:08 2016 +0100 + + make PL_ pad vars be of type PADOFFSET + + Now that that PADOFFSET is signed, make + + PL_comppad_name_fill + PL_comppad_name_floor + PL_padix + PL_constpadix + PL_padix_floor + PL_min_intro_pending + PL_max_intro_pending + + be of type PADOFFSET rather than I32, to match the rest of the pad + interface. + + At the same time, change various I32 local vars in pad.c functions to be + PADOFFSET. + +This patch adjusts Coro to the changes. + +Signed-off-by: Petr Písař <ppisar@redhat.com> +--- + Coro/state.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/Coro/state.h b/Coro/state.h +index 9a3e84f..8d6d067 100644 +--- a/Coro/state.h ++++ b/Coro/state.h +@@ -83,8 +83,13 @@ VAR(compcv, CV *) /* currently compiling subroutine */ + + VAR(comppad, AV *) /* storage for lexically scoped temporaries */ + VAR(comppad_name, AV *) /* variable names for "my" variables */ ++#if PERL_VERSION_ATLEAST (5,25,6) ++VAR(comppad_name_fill, PADOFFSET) /* last "introduced" variable offset */ ++VAR(comppad_name_floor, PADOFFSET) /* start of vars in innermost block */ ++#else + VAR(comppad_name_fill, I32) /* last "introduced" variable offset */ + VAR(comppad_name_floor, I32) /* start of vars in innermost block */ ++#endif + + VAR(runops, runops_proc_t) /* for tracing support */ + +-- +2.9.4 + |