Attachment #176594 for bug #214168




# $FreeBSD$

PORTNAME=	Coro
PORTVERSION=	6.511
PORTEPOCH=	1
CATEGORIES=	devel perl5
MASTER_SITES=	CPAN
PKGNAMEPREFIX=	p5-
#DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}

MAINTAINER=	perl@FreeBSD.org
COMMENT=	Coroutine process abstraction for perl


.include <bsd.port.pre.mk>

.if ${PERL_LEVEL} >= 502200 && ${PERL_LEVEL} < 502400
BROKEN=		Perl >= 5.22 and < 5.24 is not supported
.endif

post-install:




--- Coro/State.xs.orig	2016-06-26 21:44:30 UTC
+++ Coro/State.xs
@@ -102,6 +102,10 @@ static int cctx_max_idle = 4;
 #include "CoroAPI.h"

 #ifdef USE_ITHREADS
 # if CORO_PTHREAD
 static void *coro_thx;
@@ -1412,7 +1416,11 @@ runops_trace (pTHX)
                           PUSHMARK (SP);
                           PUSHs (&PL_sv_yes);
                           PUSHs (fullname);
+#if PERL_VERSION_ATLEAST(5,24,0)
+                          PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (PL_curpad[0])) : &PL_sv_undef);
+#else
                           PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
+#endif
                           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);

Lines 1-4 Link Here

(-)files/patch-Coro-libcoro-coro.c (-1 / +1 lines)
1	--- Coro/libcoro/coro.c.orig 2012-12-21 04:57:20 UTC	1	--- Coro/libcoro/coro.c.orig 2015-12-10 10:24:21 UTC
2	+++ Coro/libcoro/coro.c	2	+++ Coro/libcoro/coro.c
3	@@ -38,6 +38,7 @@	3	@@ -38,6 +38,7 @@
4	* go to Ralf S. Engelschall <rse@engelschall.com>.	4	* go to Ralf S. Engelschall <rse@engelschall.com>.

Return to bug 214168

Lines 1-12 Link Here

(-)Makefile (-4 / +4 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= Coro	3	PORTNAME= Coro
4	PORTVERSION= 6.51.1	4	PORTVERSION= 6.511
5	PORTEPOCH= 1	5	PORTEPOCH= 1
6	CATEGORIES= devel perl5	6	CATEGORIES= devel perl5
7	MASTER_SITES= CPAN	7	MASTER_SITES= CPAN
8	PKGNAMEPREFIX= p5-	8	PKGNAMEPREFIX= p5-
9	DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}	9	#DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
10		10
11	MAINTAINER= perl@FreeBSD.org	11	MAINTAINER= perl@FreeBSD.org
12	COMMENT= Coroutine process abstraction for perl	12	COMMENT= Coroutine process abstraction for perl
Lines 37-44 Link Here
37		37
38	.include <bsd.port.pre.mk>	38	.include <bsd.port.pre.mk>
39		39
40	.if ${PERL_LEVEL} >= 502200	40	.if ${PERL_LEVEL} >= 502200 && ${PERL_LEVEL} < 502400
41	BROKEN= Perl >= 5.22 is not supported	41	BROKEN= Perl >= 5.22 and < 5.24 is not supported
42	.endif	42	.endif
43		43
44	post-install:	44	post-install:

Lines 1-4 Link Here

(-)files/patch-Coro-State.xs (-1 / +13 lines)
1	--- Coro/State.xs.orig 2015-06-30 12:32:08 UTC	1	--- Coro/State.xs.orig 2016-06-26 21:44:30 UTC
2	+++ Coro/State.xs	2	+++ Coro/State.xs
3	@@ -102,6 +102,10 @@ static int cctx_max_idle = 4;	3	@@ -102,6 +102,10 @@ static int cctx_max_idle = 4;
4	#include "CoroAPI.h"	4	#include "CoroAPI.h"
Lines 11-13 Link Here
11	#ifdef USE_ITHREADS	11	#ifdef USE_ITHREADS
12	# if CORO_PTHREAD	12	# if CORO_PTHREAD
13	static void *coro_thx;	13	static void *coro_thx;
		14	@@ -1412,7 +1416,11 @@ runops_trace (pTHX)
		15	PUSHMARK (SP);
		16	PUSHs (&PL_sv_yes);
		17	PUSHs (fullname);
		18	+#if PERL_VERSION_ATLEAST(5,24,0)
		19	+ PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (PL_curpad[0])) : &PL_sv_undef);
		20	+#else
		21	PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
		22	+#endif
		23	PUTBACK;
		24	cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
		25	if (cb) call_sv (*cb, G_KEEPERR \| G_EVAL \| G_VOID \| G_DISCARD);