Coro 6.511 includes some patches to support perl 5.24, but it's 
apparently not enough, but fortunately someone at Debian has a patch for
the other problem building.

This update also disables the CORO_JIT because it violates W^X, yay for
a perl thing that does that I guess!

The current 6.49 port also needs to disable the JIT in order to work, so
not entirely convinced anyone actually uses this port. 

Anyway, with this, tests now pass under perl 5.24.1-RC4.

OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/p5-Coro/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile    6 Jul 2016 21:06:21 -0000       1.13
+++ Makefile    15 Oct 2016 22:21:14 -0000
@@ -3,7 +3,7 @@
 COMMENT =      coroutines for perl
 
 MODULES =      cpan
-DISTNAME =     Coro-6.49
+DISTNAME =     Coro-6.511
 REVISION =     0
 CATEGORIES =   devel
 
@@ -25,5 +25,8 @@ RUN_DEPENDS =         devel/p5-Event>=0.89 \
 # check things work.
 
 # CONFIGURE_ENV = CORO_INTERFACE=s
+
+# The Coro JIT violates W^X, so we can't use it.
+CONFIGURE_ENV += CORO_JIT=n
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/p5-Coro/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo    14 Apr 2016 22:21:21 -0000      1.5
+++ distinfo    15 Oct 2016 22:21:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (Coro-6.49.tar.gz) = B4z0wM0efgx40+DPvAfN4sHvkBpPSwc2nBF3MPriFSI=
-SIZE (Coro-6.49.tar.gz) = 191823
+SHA256 (Coro-6.511.tar.gz) = fj7UjNs/N0LZSuOrPQiMOrgYxSH4aB2mxfZWvUmsU+o=
+SIZE (Coro-6.511.tar.gz) = 195173
Index: patches/patch-Coro_State_xs
===================================================================
RCS file: patches/patch-Coro_State_xs
diff -N patches/patch-Coro_State_xs
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-Coro_State_xs 15 Oct 2016 22:21:14 -0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+Description: fix for Coro with 5.24
+Origin: https://paste.debian.net/688072
+Bug-Debian: https://bugs.debian.org/838851
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=114708
+Author: Anonymous
+Last-Update: 2016-09-25
+
+--- Coro/State.xs.orig Sun Jun 26 14:44:30 2016
++++ Coro/State.xs      Sat Oct 15 13:38:04 2016
+@@ -1412,7 +1412,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);

Reply via email to