CVS commit: pkgsrc/devel/p5-Coro

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Sep 21 22:46:11 UTC 2020

Modified Files:
        pkgsrc/devel/p5-Coro: Makefile distinfo
Added Files:
        pkgsrc/devel/p5-Coro/patches: patch-Coro_libcoro_coro.c

Log Message:
p5-Coro: add patch that fixes stability issues on NetBSD 9+

For details, see
https://mail-index.netbsd.org/current-users/2020/09/21/msg039578.html

Remove test status comment, all tests pass now.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/p5-Coro/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/p5-Coro/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/p5-Coro/patches/patch-Coro_libcoro_coro.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/p5-Coro/Makefile
diff -u pkgsrc/devel/p5-Coro/Makefile:1.29 pkgsrc/devel/p5-Coro/Makefile:1.30
--- pkgsrc/devel/p5-Coro/Makefile:1.29  Sat Sep 19 21:01:28 2020
+++ pkgsrc/devel/p5-Coro/Makefile       Mon Sep 21 22:46:11 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2020/09/19 21:01:28 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2020/09/21 22:46:11 wiz Exp $
 
 DISTNAME=      Coro-6.57
 PKGNAME=       p5-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel perl5
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=Coro/}
 
@@ -15,58 +15,10 @@ DEPENDS+=   p5-Canary-Stability-[0-9]*:../
 DEPENDS+=      p5-common-sense-[0-9]*:../../devel/p5-common-sense
 DEPENDS+=      p5-AnyEvent-[0-9]*:../../devel/p5-AnyEvent
 
-MAKE_JOBS_SAFE=        no
 PERL5_PACKLIST=        auto/Coro/.packlist
 REPLACE_PERL+= Coro/jit-amd64-unix.pl Coro/jit-x86-unix.pl
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-MAKE_ENV+=     CORO_JIT=n
-.endif
-
-# test failures after turning off JIT on NetBSD are random, best run so far:
-# as pf 6.57
-# t/00_basic.t .......... ok   
-# t/01_process.t ........ ok     
-# t/02_channel.t ........ ok     
-# t/03_channel.t ........ Failed 9/10 subtests 
-# t/04_rwlock.t ......... ok     
-# t/05_specific.t ....... ok   
-# t/06_prio.t ........... Failed 8/10 subtests 
-# t/07_eval.t ........... ok   
-# t/08_join.t ........... ok     
-# t/10_bugs.t ........... ok   
-# t/11_deadlock.t ....... ok   
-# t/12_exit.t ........... Failed 2/5 subtests 
-# t/13_diewarn.t ........ All 7 subtests passed 
-# t/14_load.t ........... ok     
-# t/15_semaphore.t ...... Failed 6/6 subtests 
-# t/16_signal.t ......... ok     
-# t/17_rouse.t .......... ok   
-# t/18_winder.t ......... ok     
-# t/19_handle.t ......... ok   
-# t/20_mutual_cancel.t .. ok     
-# Test Summary Report
-# -------------------
-# t/03_channel.t      (Wstat: 139 Tests: 1 Failed: 0)
-#   Non-zero wait status: 139
-#   Parse errors: Bad plan.  You planned 10 tests but ran 1.
-# t/06_prio.t         (Wstat: 139 Tests: 2 Failed: 0)
-#   Non-zero wait status: 139
-#   Parse errors: Bad plan.  You planned 10 tests but ran 2.
-# t/12_exit.t         (Wstat: 0 Tests: 4 Failed: 1)
-#   Failed test:  5
-#   Parse errors: Tests out of sequence.  Found (5) but expected (4)
-#                 Bad plan.  You planned 5 tests but ran 4.
-# t/13_diewarn.t      (Wstat: 139 Tests: 7 Failed: 0)
-#   Non-zero wait status: 139
-# t/15_semaphore.t    (Wstat: 139 Tests: 0 Failed: 0)
-#   Non-zero wait status: 139
-#   Parse errors: Bad plan.  You planned 6 tests but ran 0.
-# Files=20, Tests=182,  0 wallclock secs ( 0.04 usr  0.02 sys +  0.29 cusr  0.07 csys =  0.42 CPU)
-# Result: FAIL
-# Failed 5/20 test programs. 1/182 subtests failed.
+MAKE_ENV.NetBSD+=      CORO_JIT=n
 
 .include "../../devel/p5-EV/buildlink3.mk"
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/devel/p5-Coro/distinfo
diff -u pkgsrc/devel/p5-Coro/distinfo:1.15 pkgsrc/devel/p5-Coro/distinfo:1.16
--- pkgsrc/devel/p5-Coro/distinfo:1.15  Thu Sep  3 17:02:20 2020
+++ pkgsrc/devel/p5-Coro/distinfo       Mon Sep 21 22:46:11 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.15 2020/09/03 17:02:20 wiz Exp $
+$NetBSD: distinfo,v 1.16 2020/09/21 22:46:11 wiz Exp $
 
 SHA1 (Coro-6.57.tar.gz) = 1ff1c7aee5cd1c31fbc50c38ab86d0ab0930417d
 RMD160 (Coro-6.57.tar.gz) = 2959ba3cf6938a6094af43ae4e8b05779602feec
 SHA512 (Coro-6.57.tar.gz) = d5655c5df1d502c265b26e474f1423f9406029ce56254a92d78b51e14313f685575095e185758d743d78f3c74d758922ec57f714498cf982819c110d198d6f42
 Size (Coro-6.57.tar.gz) = 198128 bytes
+SHA1 (patch-Coro_libcoro_coro.c) = c8c807e6eb4ed79e3f4c5c2c7a657fc26580f3a4

Added files:

Index: pkgsrc/devel/p5-Coro/patches/patch-Coro_libcoro_coro.c
diff -u /dev/null pkgsrc/devel/p5-Coro/patches/patch-Coro_libcoro_coro.c:1.1
--- /dev/null   Mon Sep 21 22:46:11 2020
+++ pkgsrc/devel/p5-Coro/patches/patch-Coro_libcoro_coro.c      Mon Sep 21 22:46:11 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-Coro_libcoro_coro.c,v 1.1 2020/09/21 22:46:11 wiz Exp $
+
+Workaround for libpthread bug in NetBSD.
+
+--- Coro/libcoro/coro.c.orig   2018-08-14 15:37:40.000000000 +0000
++++ Coro/libcoro/coro.c
+@@ -578,6 +578,10 @@ coro_create (coro_context *ctx, coro_fun
+       /* POSIX, not here */
+       pthread_attr_setstacksize (&attr, (size_t)ssize);
+ #else
++#ifdef __NetBSD__
++      /* workaround for a bug in libpthread; the guard size should be ignored, but isn't */
++      pthread_attr_setguardsize (&attr, 0);
++#endif
+       pthread_attr_setstack (&attr, sptr, (size_t)ssize);
+ #endif
+       pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);