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

commit:     fedc5555ce3645f4501b0e76844c55e63a14d892
Author:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 12:07:49 2016 +0000
Commit:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 12:09:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fedc5555

dev-perl/Coro: Bump to version 6.511.0

- EAPI6
- Include P5P Patch for 5.24 compat with lots of warning bells.
- USE="vanilla" to provide the upstream experience ( which is presently broken on 5.24 )

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="alpha amd64 amd64-fbsd arm arm64 hppa ia64 m68k mips nios2 ppc ppc64 riscv s390 sh sparc sparc-fbsd x86 x86-fbsd"

 dev-perl/Coro/Coro-6.511.0.ebuild          | 36 +++++++++++++++++++++++++
 dev-perl/Coro/Manifest                     |  1 +
 dev-perl/Coro/files/6.511.0-argarray.patch | 42 ++++++++++++++++++++++++++++++
 3 files changed, 79 insertions(+)

diff --git a/dev-perl/Coro/Coro-6.511.0.ebuild b/dev-perl/Coro/Coro-6.511.0.ebuild
new file mode 100644
index 0000000..62ce061
--- /dev/null
+++ b/dev-perl/Coro/Coro-6.511.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=MLEHMANN
+DIST_VERSION=6.511
+inherit perl-module
+
+DESCRIPTION="The only real threads in perl"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vanilla"
+
+RDEPEND="
+	>=dev-perl/AnyEvent-5
+	>=dev-perl/Guard-0.500.0
+	virtual/perl-Scalar-List-Utils
+	>=virtual/perl-Storable-2.150.0
+	dev-perl/common-sense
+"
+DEPEND="${RDEPEND}
+	dev-perl/Canary-Stability
+	>=virtual/perl-ExtUtils-MakeMaker-6.520.0
+"
+
+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."
+		eapply "${FILESDIR}/${PV}-argarray.patch"
+	fi
+	perl-module_src_prepare
+}

diff --git a/dev-perl/Coro/Manifest b/dev-perl/Coro/Manifest
index 5f09f65..6255c81 100644
--- a/dev-perl/Coro/Manifest
+++ b/dev-perl/Coro/Manifest
@@ -1 +1,2 @@
 DIST Coro-6.4801.tar.gz 190759 SHA256 e20d4987244ee982ffab00fc66f4897e6c9d4c8b7aa86889c19228006a60789c SHA512 2b53a4feb4d187d74d09c30c95765c2f8b416f95f7026f1d7e6fd37bc300f041fd8f72a44017036920c242d0ba7ab21bc32cf7183570fad9eeab706df60f7684 WHIRLPOOL be44764aa5a42c510721b7b7a6b17bd79acf1127667c8fd3eb8c0d92fc47e4c0110505b06425ee03ef56df5a9e8871c8f14abc9d29fa704e0628bd52521a1d78
+DIST Coro-6.511.tar.gz 195173 SHA256 7e3ed48cdb3f3742d94ae3ab3d088c3ab818c521f8681da6c5f656bd49ac53ea SHA512 c3e591539e3313403496d3396e68147942e45590732bbaed7b3020fdc79e1e726c3addc3fc5d5d3e173c2b3faff4de2a9d0bae19f91cdc684285c2751b809681 WHIRLPOOL 3a56fca3116d1b2b6cd727078ebed9811aa627756c08c439ee6bceabba75117c904b692bf147f251dcd978abcf63e0d0f24e9ef068adf1592c4ff9539ae64daf

diff --git a/dev-perl/Coro/files/6.511.0-argarray.patch b/dev-perl/Coro/files/6.511.0-argarray.patch
new file mode 100644
index 0000000..2434944
--- /dev/null
+++ b/dev-perl/Coro/files/6.511.0-argarray.patch
@@ -0,0 +1,42 @@
+From 38fe74765a4cbf1003cc2011559bf83b05b10e46 Mon Sep 17 00:00:00 2001
+From: David Mitchell <davem@iabyn.com>
+Date: Tue, 3 May 2016 22:25:48 +0100
+Subject: [PATCH 3/5] Coro: handle argarray removal in 5.23.8
+
+---
+ Coro/State.xs | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/Coro/State.xs b/Coro/State.xs
+index 93c2c5b..28264c5 100644
+--- a/Coro/State.xs
++++ b/Coro/State.xs
+@@ -1415,6 +1415,7 @@ runops_trace (pTHX)
+                       if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
+                         {
+                           dSP;
++                          AV *argarray;
+                           GV *gv = CvGV (cx->blk_sub.cv);
+                           SV *fullname = sv_2mortal (newSV (0));
+ 
+@@ -1428,7 +1429,16 @@ runops_trace (pTHX)
+                           PUSHMARK (SP);
+                           PUSHs (&PL_sv_yes);
+                           PUSHs (fullname);
+-                          PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
++                          argarray =
++# if PERL_VERSION_ATLEAST(5,23,8)
++                            ((AV*)(AvARRAY(MUTABLE_AV(
++                              PadlistARRAY(CvPADLIST(cx->blk_sub.cv))[
++                              CvDEPTH(cx->blk_sub.cv)]))[0]));
++#else
++                            cx->blk_sub.argarray;
++#endif
++
++                          PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)argarray)) : &PL_sv_undef);
+                           PUTBACK;
+                           cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
+                           if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
+-- 
+2.4.11
+


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

* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Coro/files/, dev-perl/Coro/
@ 2017-10-05 11:03 Kent Fredric
  0 siblings, 0 replies; 2+ messages in thread
From: Kent Fredric @ 2017-10-05 11:03 UTC (permalink / raw
  To: gentoo-commits

commit:     4aadbf045debeb60a050f4dc3ec167925bba151f
Author:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  5 05:30:55 2017 +0000
Commit:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Thu Oct  5 11:03:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aadbf04

dev-perl/Coro: Bump to version 6.514.0

- Patches all upstremed
- Add USE="examples"
- Fix automagic building of EV/Event

Upstream:
- Fixes for supporting API changes in Perl 5.22, 5.24, 5.26...
- disable FORTIFY_SOURCE to avoid fortifed-but-broken longjmp in some
  libc's
- Partially improved JIT allocation
- Fixes for statevar types on newer perls
- safe_cancel no longer croaks from already destroyed threads.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

dev-perl/Coro: fix automagic builds

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-perl/Coro/Coro-6.514.0.ebuild           | 38 +++++++++++++++
 dev-perl/Coro/Manifest                      |  1 +
 dev-perl/Coro/files/6.514.0-ev-config.patch | 74 +++++++++++++++++++++++++++++
 dev-perl/Coro/metadata.xml                  |  4 ++
 4 files changed, 117 insertions(+)

diff --git a/dev-perl/Coro/Coro-6.514.0.ebuild b/dev-perl/Coro/Coro-6.514.0.ebuild
new file mode 100644
index 00000000000..5cbecd4664f
--- /dev/null
+++ b/dev-perl/Coro/Coro-6.514.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MLEHMANN
+DIST_VERSION=6.514
+DIST_EXAMPLES=( "eg/*" )
+inherit perl-module
+
+DESCRIPTION="The only real threads in perl"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ev event"
+
+RDEPEND="
+	>=dev-perl/AnyEvent-5
+	ev? ( >=dev-perl/EV-4.0.0 )
+	event? ( >=dev-perl/Event-0.890.0 )
+	>=dev-perl/Guard-0.500.0
+	virtual/perl-Scalar-List-Utils
+	>=virtual/perl-Storable-2.150.0
+	dev-perl/common-sense
+"
+DEPEND="${RDEPEND}
+	dev-perl/Canary-Stability
+	>=virtual/perl-ExtUtils-MakeMaker-6.520.0
+"
+PATCHES=(
+	"${FILESDIR}/${PV}-ev-config.patch"
+)
+src_configure() {
+	local myopts=()
+	use ev && myopts+=("EV")
+	use event && myopts+=( "Event" )
+	GENTOO_OPTS="${myopts[@]}" perl-module_src_configure
+}

diff --git a/dev-perl/Coro/Manifest b/dev-perl/Coro/Manifest
index 59f0efd6346..2daf9235223 100644
--- a/dev-perl/Coro/Manifest
+++ b/dev-perl/Coro/Manifest
@@ -1 +1,2 @@
 DIST Coro-6.511.tar.gz 195173 SHA256 7e3ed48cdb3f3742d94ae3ab3d088c3ab818c521f8681da6c5f656bd49ac53ea SHA512 c3e591539e3313403496d3396e68147942e45590732bbaed7b3020fdc79e1e726c3addc3fc5d5d3e173c2b3faff4de2a9d0bae19f91cdc684285c2751b809681 WHIRLPOOL 3a56fca3116d1b2b6cd727078ebed9811aa627756c08c439ee6bceabba75117c904b692bf147f251dcd978abcf63e0d0f24e9ef068adf1592c4ff9539ae64daf
+DIST Coro-6.514.tar.gz 195122 SHA256 d83343839290a72db302a14b1ad86f0069f0bba6d45f947252d9db490edecd62 SHA512 340eea9bc2a33c40813f4852d3a12ff947426fd329a4867a36262a9ece936c9e43d36ba5e4355d1f8f91cb40690de3bb1637ab0b0651518c22fb17a34ee90b37 WHIRLPOOL 8a4f5c4e7e58698ac70dc6d958405e65f98675526637f1a329cc3f4e244d6d0b27b5bd1b30ea742619f98ea2d57d507745f75feb78c7906b2e3bbd792ae9baf5

diff --git a/dev-perl/Coro/files/6.514.0-ev-config.patch b/dev-perl/Coro/files/6.514.0-ev-config.patch
new file mode 100644
index 00000000000..7b775b557ed
--- /dev/null
+++ b/dev-perl/Coro/files/6.514.0-ev-config.patch
@@ -0,0 +1,74 @@
+From bada194851e0a6839f78e811bfc63c2d5e8877dc Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Thu, 5 Oct 2017 22:02:38 +1300
+Subject: Make EV/Event not auto-compiled, but rely on configuration
+
+---
+ Makefile.PL | 51 ++++++++++-----------------------------------------
+ 1 file changed, 10 insertions(+), 41 deletions(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index e58e210..25243ff 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -17,47 +17,16 @@ EOF
+ 
+ print "*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***\n\n";
+ 
+-if (eval { require Event }) {
+-   if ($Event::VERSION < 0.86 or $Event::VERSION == 0.88) {
+-      print <<EOF
+-
+-***
+-*** WARNING: Event version $Event::VERSION found, NOT building Event support.
+-***
+-*** This version of Event is broken. The only currently known non-broken
+-*** versions of Event are 0.87 and 0.89+. Please install one of those
+-*** versions.
+-***
+-
+-EOF
+-   } else {
+-      $EVENT = 1;
+-      $DEFINE .= " -DHAVE_EVENT=1";
+-      print "\nEvent version $Event::VERSION found, building Event support.\n\n";
+-   }
+-} else {
+-   print "\n*** Event not found, not building Event support.\n\n";
+-}
+-
+-if (eval { require EV }) {
+-   if ($EV::VERSION < 4.0) {
+-      print <<EOF
+-
+-***
+-*** WARNING: EV version $EV::VERSION found, NOT building EV support.
+-***
+-*** This version is ABI-incompatible with Coro, please upgrade to at least 4.0.
+-***
+-
+-EOF
+-   } else {
+-      $EV = 1;
+-      $DEFINE .= " -DHAVE_EV=1";
+-      print "\nEV version $EV::VERSION found, building EV support.\n\n";
+-   }
+-} else {
+-   print "\n*** EV not found, not building EV support.\n\n";
+-}
++$EVENT = ( $ENV{GENTOO_OPTS} =~ /\bEvent\b/ );
++$EV    = ( $ENV{GENTOO_OPTS} =~ /\bEV\b/ );
++$EVENT and do {
++  require Event;
++  Event->VERSION(0.89);
++};
++$EV and do {
++  require EV;
++  EV->VERSION(4.0);
++};
+ 
+ WriteMakefile(
+     dist         => {
+-- 
+2.14.1
+

diff --git a/dev-perl/Coro/metadata.xml b/dev-perl/Coro/metadata.xml
index 9595d5b9e4c..b9f208cf254 100644
--- a/dev-perl/Coro/metadata.xml
+++ b/dev-perl/Coro/metadata.xml
@@ -5,6 +5,10 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <use>
+    <flag name="ev">Build support for using <pkg>dev-perl/EV</pkg> as an event-loop via Coro::EV</flag>
+    <flag name="event">Build support for using <pkg>dev-perl/Event</pkg> as an event-loop via Coro::Event</flag>
+  </use>
   <upstream>
     <remote-id type="cpan">Coro</remote-id>
     <remote-id type="cpan-module">Coro</remote-id>


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

end of thread, other threads:[~2017-10-05 11:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-05 11:03 [gentoo-commits] repo/gentoo:master commit in: dev-perl/Coro/files/, dev-perl/Coro/ Kent Fredric
  -- strict thread matches above, loose matches on Subject: below --
2016-07-11 12:12 Kent Fredric

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