CVS commit: pkgsrc/www/unit

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sun Aug 22 05:10:19 UTC 2021

Modified Files:
        pkgsrc/www/unit: Makefile distinfo
Added Files:
        pkgsrc/www/unit/patches: patch-src_nxt__thread.h

Log Message:
unit: fix SunOS build

Part of this might be better fixed differently in the problematic code,
but this addresses it for now.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/unit/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/unit/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/unit/patches/patch-src_nxt__thread.h

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

Modified files:

Index: pkgsrc/www/unit/Makefile
diff -u pkgsrc/www/unit/Makefile:1.4 pkgsrc/www/unit/Makefile:1.5
--- pkgsrc/www/unit/Makefile:1.4        Sun Aug 22 04:00:43 2021
+++ pkgsrc/www/unit/Makefile    Sun Aug 22 05:10:19 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/08/22 04:00:43 gutteridge Exp $
+# $NetBSD: Makefile,v 1.5 2021/08/22 05:10:19 gutteridge Exp $
 
 .include "../../www/unit/version.mk"
 
@@ -10,5 +10,7 @@ MAINTAINER=   osa%FreeBSD.org@localhost
 
 RCD_SCRIPTS=   unit
 
+BUILDLINK_TRANSFORM.SunOS+=    rm:-Werror
+       
 .include "../../www/unit/Makefile.common"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/unit/distinfo
diff -u pkgsrc/www/unit/distinfo:1.2 pkgsrc/www/unit/distinfo:1.3
--- pkgsrc/www/unit/distinfo:1.2        Sun Aug 22 04:00:43 2021
+++ pkgsrc/www/unit/distinfo    Sun Aug 22 05:10:19 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2021/08/22 04:00:43 gutteridge Exp $
+$NetBSD: distinfo,v 1.3 2021/08/22 05:10:19 gutteridge Exp $
 
 SHA1 (unit-1.25.0.tar.gz) = f235f96f7f51f169bae85222dbc8c93ece69d589
 RMD160 (unit-1.25.0.tar.gz) = d08da7f6404e3fad4a69f31ba203cc9a3b69024c
@@ -8,5 +8,6 @@ SHA1 (patch-auto_events) = 0347dfefbedaa
 SHA1 (patch-auto_os_conf) = 6d1cd7aef662a60d4288014eb6fadbe8c1268e55
 SHA1 (patch-src_nxt__kqueue__engine.c) = c341425f4b21d4cff6e003958f88a04b53dc4ee1
 SHA1 (patch-src_nxt__php__sapi.c) = 2d5e557ff2066bec78f5bfbca6a64688f60da01b
+SHA1 (patch-src_nxt__thread.h) = 48e679dbfd469604ee0277fde84507c2a99c4e53
 SHA1 (patch-src_nxt__unix.h) = c0db5bc4d9c45a3ead48627567284d8b3041b0a0
 SHA1 (patch-src_nxt__websocket__header.h) = 1b50405b187cc8a662372a1c20ab7737278135ae

Added files:

Index: pkgsrc/www/unit/patches/patch-src_nxt__thread.h
diff -u /dev/null pkgsrc/www/unit/patches/patch-src_nxt__thread.h:1.1
--- /dev/null   Sun Aug 22 05:10:19 2021
+++ pkgsrc/www/unit/patches/patch-src_nxt__thread.h     Sun Aug 22 05:10:19 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_nxt__thread.h,v 1.1 2021/08/22 05:10:19 gutteridge Exp $
+
+SunOS defines PTHREAD_STACK_MIN as a function call.
+
+--- src/nxt_thread.h.orig      1970-01-01 00:00:00.000000000 +0000
++++ src/nxt_thread.h
+@@ -142,7 +142,7 @@ nxt_thread_yield()
+ #endif
+ 
+ 
+-#if (PTHREAD_STACK_MIN)
++#ifdef PTHREAD_STACK_MIN
+ #define NXT_THREAD_STACK_MIN  PTHREAD_STACK_MIN
+ 
+ #else