View | Details | Raw Unified | Return to bug 250825 | Differences between
and this patch

Collapse All | Expand All

(-)fluent-bit/files/patch-lib_flb__libco_settings.h (+11 lines)
Line 0 Link Here
1
--- lib/flb_libco/settings.h.orig	2020-11-16 20:38:14 UTC
2
+++ lib/flb_libco/settings.h
3
@@ -42,6 +42,8 @@
4
   #define text_section __declspec(allocate(".text"))
5
 #elif defined(__APPLE__) && defined(__MACH__)
6
   #define text_section __attribute__((section("__TEXT,__text")))
7
+#elif defined(__clang__)
8
+  #define text_section __attribute__((section(".text")))
9
 #else
10
   #define text_section __attribute__((section(".text#")))
11
 #endif
(-)fluent-bit/files/patch-lib_monkey_deps_flb__libco_settings.h (+11 lines)
Line 0 Link Here
1
--- lib/monkey/deps/flb_libco/settings.h.orig	2020-11-16 20:40:21 UTC
2
+++ lib/monkey/deps/flb_libco/settings.h
3
@@ -42,6 +42,8 @@
4
   #define text_section __declspec(allocate(".text"))
5
 #elif defined(__APPLE__) && defined(__MACH__)
6
   #define text_section __attribute__((section("__TEXT,__text")))
7
+#elif defined(__clang__)
8
+  #define text_section __attribute__((section(".text")))
9
 #else
10
   #define text_section __attribute__((section(".text#")))
11
 #endif
(-)fluent-bit/files/patch-src_flb__scheduler.c (+11 lines)
Line 0 Link Here
1
--- src/flb_scheduler.c.orig	2020-11-16 20:32:16 UTC
2
+++ src/flb_scheduler.c
3
@@ -44,7 +44,7 @@ static inline int consume_byte(flb_pipef
4
 
5
     /* We need to consume the byte */
6
     ret = flb_pipe_r(fd, &val, sizeof(val));
7
-#ifdef __APPLE__
8
+#if defined(__APPLE__) || __FreeBSD__ >= 12
9
     if (ret < 0) {
10
 #else
11
     if (ret <= 0) {
(-)fluent-bit/Makefile (-1 / +2 lines)
Lines 4-9 Link Here
4
PORTNAME=	fluent-bit
4
PORTNAME=	fluent-bit
5
DISTVERSIONPREFIX=	v
5
DISTVERSIONPREFIX=	v
6
DISTVERSION=	1.6.4
6
DISTVERSION=	1.6.4
7
PORTREVISION=	1
7
CATEGORIES=	sysutils
8
CATEGORIES=	sysutils
8
9
9
MAINTAINER=	girgen@FreeBSD.org
10
MAINTAINER=	girgen@FreeBSD.org
Lines 11-17 Link Here
11
12
12
LICENSE=	APACHE20
13
LICENSE=	APACHE20
13
14
14
USE_GITHUB=     yes
15
USE_GITHUB=	yes
15
GH_ACCOUNT=	fluent
16
GH_ACCOUNT=	fluent
16
17
17
BROKEN_mips=		fails to build: conflicting types for 'restrict'
18
BROKEN_mips=		fails to build: conflicting types for 'restrict'

Return to bug 250825