diff options
author | joerg <joerg@pkgsrc.org> | 2020-04-20 00:45:56 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2020-04-20 00:45:56 +0000 |
commit | 770228e3e43c0243b86d40997a8cd7c0e4c97049 (patch) | |
tree | 4c06721ceec5eb668f50a976a2350fdc511f6e5f /sysutils | |
parent | eb51b63d8360a98e93a20ef8db621be3f4d583f1 (diff) | |
download | pkgsrc-770228e3e43c0243b86d40997a8cd7c0e4c97049.tar.gz |
NetBSD doesn't have PTHREAD_STACK_MIN, so pick something useful.
Deal with serial constants only provided conditionally.
Diffstat (limited to 'sysutils')
3 files changed, 36 insertions, 1 deletions
diff --git a/sysutils/fluent-bit/distinfo b/sysutils/fluent-bit/distinfo index 9b79ba698e2..ae841033529 100644 --- a/sysutils/fluent-bit/distinfo +++ b/sysutils/fluent-bit/distinfo @@ -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 diff --git a/sysutils/fluent-bit/patches/patch-include_fluent-bit_flb__thread__libco.h b/sysutils/fluent-bit/patches/patch-include_fluent-bit_flb__thread__libco.h new file mode 100644 index 00000000000..7cedad8acc7 --- /dev/null +++ b/sysutils/fluent-bit/patches/patch-include_fluent-bit_flb__thread__libco.h @@ -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 <machine/vmparam.h> ++#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; diff --git a/sysutils/fluent-bit/patches/patch-plugins_in__serial_in__serial.c b/sysutils/fluent-bit/patches/patch-plugins_in__serial_in__serial.c new file mode 100644 index 00000000000..33a7cd1e2e5 --- /dev/null +++ b/sysutils/fluent-bit/patches/patch-plugins_in__serial_in__serial.c @@ -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 <fluent-bit/flb_info.h> + #include <fluent-bit/flb_input.h> |