CVS commit: pkgsrc/devel/libuv

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Mar 27 15:34:00 UTC 2017

Modified Files:
        pkgsrc/devel/libuv: distinfo
Added Files:
        pkgsrc/devel/libuv/patches: patch-src_unix_thread.c

Log Message:
libuv: don't call pthread_condattr_setclock on netbsd.

it is effectively a no-op, and doesn't exist on netbsd<7, leading to
undefined references in building cmake later on.

this fixes the build of cmake on NetBSD 6.1.5.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/libuv/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libuv/patches/patch-src_unix_thread.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/libuv/distinfo
diff -u pkgsrc/devel/libuv/distinfo:1.12 pkgsrc/devel/libuv/distinfo:1.13
--- pkgsrc/devel/libuv/distinfo:1.12    Wed Mar 22 01:45:07 2017
+++ pkgsrc/devel/libuv/distinfo Mon Mar 27 15:34:00 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2017/03/22 01:45:07 taca Exp $
+$NetBSD: distinfo,v 1.13 2017/03/27 15:34:00 maya Exp $
 
 SHA1 (libuv-1.11.0.tar.gz) = 54f0972aa0d3f6a6036d477b381c01f030f9a2b5
 RMD160 (libuv-1.11.0.tar.gz) = f2ed5e5c457a66625875d9fcd56584feebc94268
@@ -6,3 +6,4 @@ SHA512 (libuv-1.11.0.tar.gz) = fb0415d62
 Size (libuv-1.11.0.tar.gz) = 1083067 bytes
 SHA1 (patch-autogen.sh) = a5f48189bfb17624c545a80626ea311b7755d232
 SHA1 (patch-src_unix_fs.c) = 21fffa99df9528aedee0c6fe299d28ff5110d2ba
+SHA1 (patch-src_unix_thread.c) = 8f7aeb216cef32648c70df7abc7bba2bade9b1b8

Added files:

Index: pkgsrc/devel/libuv/patches/patch-src_unix_thread.c
diff -u /dev/null pkgsrc/devel/libuv/patches/patch-src_unix_thread.c:1.1
--- /dev/null   Mon Mar 27 15:34:00 2017
+++ pkgsrc/devel/libuv/patches/patch-src_unix_thread.c  Mon Mar 27 15:34:00 2017
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_unix_thread.c,v 1.1 2017/03/27 15:34:00 maya Exp $
+
+Don't use pthread_condattr_setclock on NetBSD. It's effectively
+a no-op, and doesn't exist on NetBSD<7 leading to undefined refs
+in building cmake.
+
+--- src/unix/thread.c.orig     2017-02-01 00:38:56.000000000 +0000
++++ src/unix/thread.c
+@@ -424,7 +424,8 @@ int uv_cond_init(uv_cond_t* cond) {
+   if (err)
+     return -err;
+ 
+-#if !(defined(__ANDROID__) && defined(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC))
++#if !(defined(__ANDROID__) && defined(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC)) && \
++    !(defined(__NetBSD__))
+   err = pthread_condattr_setclock(&attr, CLOCK_MONOTONIC);
+   if (err)
+     goto error2;