Attachment 219749 Details for Bug 250825 – Proposed patch for inclusion in the ports tree

[patch] Proposed patch for inclusion in the ports tree

fluent-bit1641.diff (text/plain), 2.65 KB, created by Artyom Davidov on 2020-11-16 23:49:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Artyom Davidov

Created: 2020-11-16 23:49:01 UTC

Size: 2.65 KB

patch

obsolete

>diff -ruN fluent-bit.orig/files/patch-lib_flb__libco_settings.h fluent-bit/files/patch-lib_flb__libco_settings.h
>--- fluent-bit.orig/files/patch-lib_flb__libco_settings.h	1970-01-01 03:00:00.000000000 +0300
>+++ fluent-bit/files/patch-lib_flb__libco_settings.h	2020-11-16 23:42:46.616682000 +0300
>@@ -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
>diff -ruN fluent-bit.orig/files/patch-lib_monkey_deps_flb__libco_settings.h fluent-bit/files/patch-lib_monkey_deps_flb__libco_settings.h
>--- fluent-bit.orig/files/patch-lib_monkey_deps_flb__libco_settings.h	1970-01-01 03:00:00.000000000 +0300
>+++ fluent-bit/files/patch-lib_monkey_deps_flb__libco_settings.h	2020-11-16 23:42:46.618360000 +0300
>@@ -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
>diff -ruN fluent-bit.orig/files/patch-src_flb__scheduler.c fluent-bit/files/patch-src_flb__scheduler.c
>--- fluent-bit.orig/files/patch-src_flb__scheduler.c	1970-01-01 03:00:00.000000000 +0300
>+++ fluent-bit/files/patch-src_flb__scheduler.c	2020-11-16 23:42:46.620020000 +0300
>@@ -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) {
>diff -ruN fluent-bit.orig/Makefile fluent-bit/Makefile
>--- fluent-bit.orig/Makefile	2020-11-13 23:06:27.000000000 +0300
>+++ fluent-bit/Makefile	2020-11-17 00:06:58.109849000 +0300
>@@ -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 @@
> 
> LICENSE=	APACHE20
> 
>-USE_GITHUB=     yes
>+USE_GITHUB=	yes
> GH_ACCOUNT=	fluent
> 
> BROKEN_mips=		fails to build: conflicting types for 'restrict'

Actions: View | Diff

Attachments on bug 250825: 219617 | 219618 | 219657 | 219658 | 219749 | 219750 | 219751 | 219752 | 219753 | 219754