Date: Tue, 17 Nov 2020 09:50:17 +0000 (UTC) From: Palle Girgensohn <girgen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r555545 - in head/sysutils/fluent-bit: . files Message-ID: <202011170950.0AH9oHWZ037331@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: girgen Date: Tue Nov 17 09:50:16 2020 New Revision: 555545 URL: https://svnweb.freebsd.org/changeset/ports/555545 Log: Fix SIGSEGV fault on FreeBSD 12+ PR: 250825 Submitted by: Artyom Davidov Added: head/sysutils/fluent-bit/files/patch-lib_flb__libco_settings.h (contents, props changed) head/sysutils/fluent-bit/files/patch-lib_monkey_deps_flb__libco_settings.h (contents, props changed) head/sysutils/fluent-bit/files/patch-src_flb__scheduler.c (contents, props changed) Modified: head/sysutils/fluent-bit/Makefile Modified: head/sysutils/fluent-bit/Makefile ============================================================================== --- head/sysutils/fluent-bit/Makefile Tue Nov 17 09:48:35 2020 (r555544) +++ head/sysutils/fluent-bit/Makefile Tue Nov 17 09:50:16 2020 (r555545) @@ -4,6 +4,7 @@ PORTNAME= fluent-bit DISTVERSIONPREFIX= v DISTVERSION= 1.6.4 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= girgen@FreeBSD.org @@ -11,7 +12,7 @@ COMMENT= Fast and lightweight data forwarder LICENSE= APACHE20 -USE_GITHUB= yes +USE_GITHUB= yes GH_ACCOUNT= fluent BROKEN_mips= fails to build: conflicting types for 'restrict' Added: head/sysutils/fluent-bit/files/patch-lib_flb__libco_settings.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/fluent-bit/files/patch-lib_flb__libco_settings.h Tue Nov 17 09:50:16 2020 (r555545) @@ -0,0 +1,11 @@ +--- lib/flb_libco/settings.h.orig 2020-11-16 20:38:14 UTC ++++ lib/flb_libco/settings.h +@@ -42,6 +42,8 @@ + #define text_section __declspec(allocate(".text")) + #elif defined(__APPLE__) && defined(__MACH__) + #define text_section __attribute__((section("__TEXT,__text"))) ++#elif defined(__clang__) ++ #define text_section __attribute__((section(".text"))) + #else + #define text_section __attribute__((section(".text#"))) + #endif Added: head/sysutils/fluent-bit/files/patch-lib_monkey_deps_flb__libco_settings.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/fluent-bit/files/patch-lib_monkey_deps_flb__libco_settings.h Tue Nov 17 09:50:16 2020 (r555545) @@ -0,0 +1,11 @@ +--- lib/monkey/deps/flb_libco/settings.h.orig 2020-11-16 20:40:21 UTC ++++ lib/monkey/deps/flb_libco/settings.h +@@ -42,6 +42,8 @@ + #define text_section __declspec(allocate(".text")) + #elif defined(__APPLE__) && defined(__MACH__) + #define text_section __attribute__((section("__TEXT,__text"))) ++#elif defined(__clang__) ++ #define text_section __attribute__((section(".text"))) + #else + #define text_section __attribute__((section(".text#"))) + #endif Added: head/sysutils/fluent-bit/files/patch-src_flb__scheduler.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/fluent-bit/files/patch-src_flb__scheduler.c Tue Nov 17 09:50:16 2020 (r555545) @@ -0,0 +1,11 @@ +--- src/flb_scheduler.c.orig 2020-11-16 20:32:16 UTC ++++ src/flb_scheduler.c +@@ -44,7 +44,7 @@ static inline int consume_byte(flb_pipef + + /* We need to consume the byte */ + ret = flb_pipe_r(fd, &val, sizeof(val)); +-#ifdef __APPLE__ ++#if defined(__APPLE__) || __FreeBSD__ >= 12 + if (ret < 0) { + #else + if (ret <= 0) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011170950.0AH9oHWZ037331>