Received: by mail.netbsd.org (Postfix, from userid 605) id 9EB0D84DAD; Mon, 20 Apr 2020 00:45:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2725384D68 for ; Mon, 20 Apr 2020 00:45:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id s8Iave7D1vAq for ; Mon, 20 Apr 2020 00:45:56 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 90B9E84D28 for ; Mon, 20 Apr 2020 00:45:56 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 86FB3FB27; Mon, 20 Apr 2020 00:45:56 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158734355685780" MIME-Version: 1.0 Date: Mon, 20 Apr 2020 00:45:56 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/sysutils/fluent-bit To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20200420004556.86FB3FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_158734355685780 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Mon Apr 20 00:45:56 UTC 2020 Modified Files: pkgsrc/sysutils/fluent-bit: distinfo Added Files: pkgsrc/sysutils/fluent-bit/patches: patch-include_fluent-bit_flb__thread__libco.h patch-plugins_in__serial_in__serial.c Log Message: NetBSD doesn't have PTHREAD_STACK_MIN, so pick something useful. Deal with serial constants only provided conditionally. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/fluent-bit/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/sysutils/fluent-bit/patches/patch-include_fluent-bit_flb__thread__libco.h \ pkgsrc/sysutils/fluent-bit/patches/patch-plugins_in__serial_in__serial.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158734355685780 Content-Disposition: inline Content-Length: 3019 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/fluent-bit/distinfo diff -u pkgsrc/sysutils/fluent-bit/distinfo:1.1 pkgsrc/sysutils/fluent-bit/distinfo:1.2 --- pkgsrc/sysutils/fluent-bit/distinfo:1.1 Sun Jun 17 16:33:35 2018 +++ pkgsrc/sysutils/fluent-bit/distinfo Mon Apr 20 00:45:56 2020 @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.1 2018/06/17 16:33:35 minskim Exp $ +$NetBSD: distinfo,v 1.2 2020/04/20 00:45:56 joerg Exp $ SHA1 (fluent-bit-0.13.2.tar.gz) = 7d44b4655874fb6d63fe15bce780067df7f2ffe3 RMD160 (fluent-bit-0.13.2.tar.gz) = ab64676e78ed86cd90cf1f89f711d88ba2e69c92 SHA512 (fluent-bit-0.13.2.tar.gz) = 787e1d8f1c50e39642f7b637938c5e5d4dd8400bd89c9ed929830bf19e4617baf0bd25503ab5be5711ea85c0030061872447203bbd20255bb87649615ab350e0 Size (fluent-bit-0.13.2.tar.gz) = 8758919 bytes SHA1 (patch-CMakeLists.txt) = 8991f16aa7248fbadc4da85d1f85614a7205f290 +SHA1 (patch-include_fluent-bit_flb__thread__libco.h) = 20d36afdafafadf87e66112cae9d9c8916f9d39e +SHA1 (patch-plugins_in__serial_in__serial.c) = c66bfe406e27ad6b10025f2bc6e17b0668c0c82b SHA1 (patch-src_CMakeLists.txt) = 6348980494bfc7ce958ad622a54e7b633e8e0c94 Added files: Index: pkgsrc/sysutils/fluent-bit/patches/patch-include_fluent-bit_flb__thread__libco.h diff -u /dev/null pkgsrc/sysutils/fluent-bit/patches/patch-include_fluent-bit_flb__thread__libco.h:1.1 --- /dev/null Mon Apr 20 00:45:56 2020 +++ pkgsrc/sysutils/fluent-bit/patches/patch-include_fluent-bit_flb__thread__libco.h Mon Apr 20 00:45:56 2020 @@ -0,0 +1,19 @@ +$NetBSD: patch-include_fluent-bit_flb__thread__libco.h,v 1.1 2020/04/20 00:45:56 joerg Exp $ + +NetBSD doesn't define THREAD_STACK_MIN, so pick an arbitrary 16 pages. + +--- include/fluent-bit/flb_thread_libco.h.orig 2018-05-21 16:59:19.000000000 +0000 ++++ include/fluent-bit/flb_thread_libco.h +@@ -54,7 +54,12 @@ struct flb_thread { + void (*cb_destroy) (void *); + }; + ++#if defined(__NetBSD__) && !defined(PTHREAD_STACK_MIN) ++#include ++#define FLB_THREAD_STACK_SIZE (16 * PAGE_SIZE) ++#else + #define FLB_THREAD_STACK_SIZE ((3 * PTHREAD_STACK_MIN) / 2) ++#endif + #define FLB_THREAD_DATA(th) (((char *) th) + sizeof(struct flb_thread)) + + FLB_EXPORT pthread_key_t flb_thread_key; Index: pkgsrc/sysutils/fluent-bit/patches/patch-plugins_in__serial_in__serial.c diff -u /dev/null pkgsrc/sysutils/fluent-bit/patches/patch-plugins_in__serial_in__serial.c:1.1 --- /dev/null Mon Apr 20 00:45:56 2020 +++ pkgsrc/sysutils/fluent-bit/patches/patch-plugins_in__serial_in__serial.c Mon Apr 20 00:45:56 2020 @@ -0,0 +1,14 @@ +$NetBSD: patch-plugins_in__serial_in__serial.c,v 1.1 2020/04/20 00:45:56 joerg Exp $ + +For B57600 and higher. + +--- plugins/in_serial/in_serial.c.orig 2020-04-19 19:27:16.117063000 +0000 ++++ plugins/in_serial/in_serial.c +@@ -17,6 +17,7 @@ + * See the License for the specific language governing permissions and + * limitations under the License. + */ ++#define _NETBSD_SOURCE + + #include + #include --_----------=_158734355685780--