<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/56659e9375b5a1bf99ee81b1f9004cf2f94a0e69">https://github.com/macports/macports-ports/commit/56659e9375b5a1bf99ee81b1f9004cf2f94a0e69</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 56659e9375b fluent-bit: update to 1.8.12
</span>56659e9375b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 56659e9375b5a1bf99ee81b1f9004cf2f94a0e69
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Thu Feb 10 15:39:13 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> fluent-bit: update to 1.8.12
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - add patches for building on arm64
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/61599
</span>---
sysutils/fluent-bit/Portfile | 14 +++++++++-----
.../files/patch-monkey-flib_libco-memalign.diff | 15 +++++++++++++++
.../fluent-bit/files/patch-monkey-remove-malloc-h.diff | 13 +++++++++++++
3 files changed, 37 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fluent-bit/Portfile b/sysutils/fluent-bit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d81707b7f16..49e9623e56c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fluent-bit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fluent-bit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,10 +11,9 @@ PortGroup legacysupport 1.1
</span> legacysupport.newest_darwin_requires_legacy 15
name fluent-bit
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.8.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.8.12
</span> revision 0
categories sysutils
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license Apache-2
homepage https://fluentbit.io
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,9 +34,14 @@ maintainers {l2dy @l2dy} \
</span> set branch [join [lrange [split ${version} .] 0 1] .]
master_sites ${homepage}/releases/${branch}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f246c6478a6a9561207c1286d3a63bf489bd825c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8dc5f2423e3357ffafb064d8e941fe842781cbd656dc1ffaa844fbc0d2f82462 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14811466
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b49fa3956d67a7da292c93adc77e8785263c8aea \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 97bc8f2bc2f9d443c08e57ddf7863cac5549571e7c96c32c482a075bbd219d86 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14827047
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${configure.build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-monkey-remove-malloc-h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-monkey-flib_libco-memalign.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# /usr/bin/ranlib: unknown option character `n' in: -no_warning_for_no_symbols
compiler.blacklist-append {clang < 700}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fluent-bit/files/patch-monkey-flib_libco-memalign.diff b/sysutils/fluent-bit/files/patch-monkey-flib_libco-memalign.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1e5b1d85aea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fluent-bit/files/patch-monkey-flib_libco-memalign.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./lib/monkey/deps/flb_libco/aarch64.c.orig 2022-02-10 15:21:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./lib/monkey/deps/flb_libco/aarch64.c 2022-02-10 15:22:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,12 +68,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size = (size + 1023) & ~1023;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cothread_t handle = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if HAVE_POSIX_MEMALIGN >= 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (posix_memalign(&handle, 1024, size + 512) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- handle = memalign(1024, size + 512);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!handle)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return handle;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fluent-bit/files/patch-monkey-remove-malloc-h.diff b/sysutils/fluent-bit/files/patch-monkey-remove-malloc-h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7d239d41cb3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fluent-bit/files/patch-monkey-remove-malloc-h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./lib/monkey/deps/flb_libco/aarch64.c 2021-12-11 00:09:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./lib/monkey/deps/flb_libco/aarch64.c 2021-12-11 00:09:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,10 +12,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef IOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <malloc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern "C" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>