<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/e6f8edd39517d97e43458d8d66a91ec059e98a35">https://github.com/macports/macports-ports/commit/e6f8edd39517d97e43458d8d66a91ec059e98a35</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e6f8edd39517d97e43458d8d66a91ec059e98a35
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Wed Aug 14 20:52:51 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> fluent-bit: fix build for not-the-latest systems
</span>---
sysutils/fluent-bit/Portfile | 8 +++
...acos-setup-do-not-use-clang-flag-with-gcc.patch | 27 ++++++++
.../0002-posix_file.c-add-a-missing-header.patch | 27 ++++++++
sysutils/fluent-bit/files/0003-libatomic-gcc.patch | 18 +++++
...4-snappy-compat.h-fix-Big-endian-on-Apple.patch | 34 ++++++++++
...duler-fix-for-missing-pthread_threadid_np.patch | 45 ++++++++++++
.../files/0006-flb_utils.c-fix-for-macOS-12.patch | 27 ++++++++
.../0007-Fix-for-meminfo-on-32-bit-darwin.patch | 79 ++++++++++++++++++++++
8 files changed, 265 insertions(+)
<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 8b50b2bae84..a9aab15b80a 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;'>@@ -36,6 +36,14 @@ checksums rmd160 82864bd89b6c7836fae17ef17928df7d30cb092e \
</span> sha256 e75305c4ba9baa717baeacb4abbb9390f7433a74dcef0c41cc9d630288ca1d81 \
size 26767198
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-macos-setup-do-not-use-clang-flag-with-gcc.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-posix_file.c-add-a-missing-header.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-libatomic-gcc.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0004-snappy-compat.h-fix-Big-endian-on-Apple.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0005-mk_scheduler-fix-for-missing-pthread_threadid_np.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0006-flb_utils.c-fix-for-macOS-12.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0007-Fix-for-meminfo-on-32-bit-darwin.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # At least for atomics and some modules
compiler.cxx_standard 2011
# /usr/bin/ranlib: unknown option character `n' in: -no_warning_for_no_symbols
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fluent-bit/files/0001-macos-setup-do-not-use-clang-flag-with-gcc.patch b/sysutils/fluent-bit/files/0001-macos-setup-do-not-use-clang-flag-with-gcc.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..26f84694fa1
</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/0001-macos-setup-do-not-use-clang-flag-with-gcc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5da85905ae4b67dbf742d9f9f5cbf16a77d2193d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 14 Aug 2024 18:58:16 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] macos-setup: do not use clang flag with gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake/macos-setup.cmake | 4 +++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git cmake/macos-setup.cmake cmake/macos-setup.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 58681f572..c01ae829a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/macos-setup.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/macos-setup.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,7 +5,9 @@ execute_process(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OUTPUT_STRIP_TRAILING_WHITESPACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wundef-prefix=TARGET_OS_ ")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wundef-prefix=TARGET_OS_ ")
</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 (HOMEBREW EQUAL 0 AND EXISTS "${HOMEBREW_PREFIX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Found Homebrew at ${HOMEBREW_PREFIX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fluent-bit/files/0002-posix_file.c-add-a-missing-header.patch b/sysutils/fluent-bit/files/0002-posix_file.c-add-a-missing-header.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b4c4bb044b0
</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/0002-posix_file.c-add-a-missing-header.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 69551c99db208e28e64cb0e7630758261742b972 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 14 Aug 2024 18:14:34 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] posix_file.c: add a missing header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../core/shared/platform/common/posix/posix_file.c | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib/wasm-micro-runtime-WAMR-1.3.0/core/shared/platform/common/posix/posix_file.c lib/wasm-micro-runtime-WAMR-1.3.0/core/shared/platform/common/posix/posix_file.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8c4f7aa9d..262aa887d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/wasm-micro-runtime-WAMR-1.3.0/core/shared/platform/common/posix/posix_file.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/wasm-micro-runtime-WAMR-1.3.0/core/shared/platform/common/posix/posix_file.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,6 +7,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "libc_errno.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <sys/stdio.h> /* renameat */
</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 !defined(__APPLE__) && !defined(ESP_PLATFORM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define CONFIG_HAS_PWRITEV 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define CONFIG_HAS_PREADV 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fluent-bit/files/0003-libatomic-gcc.patch b/sysutils/fluent-bit/files/0003-libatomic-gcc.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4055230ed35
</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/0003-libatomic-gcc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1cd1773c7332532a271f355453e33ecb154dfe4a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 14 Aug 2024 17:42:56 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix CMake setup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fa6393f35..eca403d27 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +67,7 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FLB_FILENAME__=__FILE__")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -latomic")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -latomic")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fluent-bit/files/0004-snappy-compat.h-fix-Big-endian-on-Apple.patch b/sysutils/fluent-bit/files/0004-snappy-compat.h-fix-Big-endian-on-Apple.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..88f08d05bb3
</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/0004-snappy-compat.h-fix-Big-endian-on-Apple.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 63cf77ffc453f34bcfe4a085b95a24f1bdd068f5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 14 Aug 2024 19:02:15 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] snappy/compat.h: fix Big-endian on Apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/snappy-fef67ac/compat.h | 6 +++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib/snappy-fef67ac/compat.h lib/snappy-fef67ac/compat.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3b755f495..afa127507 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/snappy-fef67ac/compat.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/snappy-fef67ac/compat.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,14 +5,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __FreeBSD__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <sys/endian.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__APPLE_CC_) || defined(__MACH__) /* MacOS/X support */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <machine/endian.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <libkern/OSByteOrder.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define htole16(x) (x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define le32toh(x) (x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif __DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define htole16(x) __DARWIN_OSSwapInt16(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define le32toh(x) __DARWIN_OSSwapInt32(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define htole16(x) OSSwapInt16(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define le32toh(x) OSSwapInt32(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # error "Endianness is undefined"
</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;'>+2.46.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fluent-bit/files/0005-mk_scheduler-fix-for-missing-pthread_threadid_np.patch b/sysutils/fluent-bit/files/0005-mk_scheduler-fix-for-missing-pthread_threadid_np.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a72986d7e6c
</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/0005-mk_scheduler-fix-for-missing-pthread_threadid_np.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 04088e6cb1b1614ddfab29b60aebff316e009bb4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 14 Aug 2024 19:00:28 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] mk_scheduler: fix for missing pthread_threadid_np
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/monkey/mk_server/mk_scheduler.c | 14 ++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 14 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib/monkey/mk_server/mk_scheduler.c lib/monkey/mk_server/mk_scheduler.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a680d3cdf..2ccec3bed 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/monkey/mk_server/mk_scheduler.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/monkey/mk_server/mk_scheduler.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,6 +37,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <signal.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.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;'>+ #ifndef _WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/syscall.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -288,7 +292,17 @@ static int mk_sched_register_thread(struct mk_server *server)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worker->pid = syscall(__NR_gettid);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint64_t tid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 || defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tid = pthread_mach_thread_np(pthread_self());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif MAC_OS_X_VERSION_MIN_REQUIRED < 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (&pthread_threadid_np != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pthread_threadid_np(NULL, &tid);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tid = pthread_mach_thread_np(pthread_self());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pthread_threadid_np(NULL, &tid);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worker->pid = tid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worker->pid = 0xdeadbeef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fluent-bit/files/0006-flb_utils.c-fix-for-macOS-12.patch b/sysutils/fluent-bit/files/0006-flb_utils.c-fix-for-macOS-12.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..707a72bde7d
</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/0006-flb_utils.c-fix-for-macOS-12.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 2dd55595e6dc321766ce39887371c9b66f69dbb7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 14 Aug 2024 19:23:11 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] flb_utils.c: fix for macOS < 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/flb_utils.c | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/flb_utils.c src/flb_utils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2f445980d..863a4c7db 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/flb_utils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/flb_utils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,6 +49,10 @@ extern struct flb_aws_error_reporter *error_reporter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef FLB_SYSTEM_MACOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CoreFoundation/CoreFoundation.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <IOKit/IOKitLib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED < 120000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define kIOMainPortDefault kIOMasterPortDefault
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fluent-bit/files/0007-Fix-for-meminfo-on-32-bit-darwin.patch b/sysutils/fluent-bit/files/0007-Fix-for-meminfo-on-32-bit-darwin.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f5a39cd6816
</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/0007-Fix-for-meminfo-on-32-bit-darwin.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,79 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b664f9839df3b3c9f342de9ee0b7ba097bc1cba9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 14 Aug 2024 19:51:24 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix for meminfo on 32-bit darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../in_node_exporter_metrics/ne_meminfo_darwin.c | 16 ++++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 16 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git plugins/in_node_exporter_metrics/ne_meminfo_darwin.c plugins/in_node_exporter_metrics/ne_meminfo_darwin.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 23d4a34bd..822846fbb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- plugins/in_node_exporter_metrics/ne_meminfo_darwin.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plugins/in_node_exporter_metrics/ne_meminfo_darwin.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,6 +32,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mach/mach_init.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mach/mach_host.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int meminfo_configure(struct flb_ne *ctx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct cmt_counter *c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -140,7 +142,11 @@ static int meminfo_update(struct flb_ne *ctx, uint64_t ts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mach_port_t host_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mach_msg_type_number_t host_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__i386__) || defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vm_statistics_data_t vm_stat;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vm_statistics64_data_t vm_stat;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kern_return_t err;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vm_size_t page_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct xsw_usage swap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -152,7 +158,11 @@ static int meminfo_update(struct flb_ne *ctx, uint64_t ts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ host_port = mach_host_self();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ host_size = sizeof(vm_statistics_data_t) / sizeof(integer_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__i386__) || defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err = host_statistics(host_port, HOST_VM_INFO, (host_info_t)&vm_stat, &host_size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = host_statistics64(host_port, HOST_VM_INFO, (host_info_t)&vm_stat, &host_size);
</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 (err != KERN_SUCCESS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flb_plg_error(ctx->ins, "host_statistics() is failed with error = %d", err);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -177,8 +187,10 @@ static int meminfo_update(struct flb_ne *ctx, uint64_t ts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmt_gauge_set(ctx->darwin_free_bytes, ts,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ps * vm_stat.free_count, 0, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (MAC_OS_X_VERSION_MIN_REQUIRED >= 1060) && !defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmt_gauge_set(ctx->darwin_compressed_bytes, ts,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ps * vm_stat.compressor_page_count, 0, NULL);
</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;'>+ cmt_gauge_set(ctx->darwin_active_bytes, ts,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ps * vm_stat.active_count, 0, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,14 +198,18 @@ static int meminfo_update(struct flb_ne *ctx, uint64_t ts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmt_gauge_set(ctx->darwin_inactive_bytes, ts,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ps * vm_stat.inactive_count, 0, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (MAC_OS_X_VERSION_MIN_REQUIRED >= 1060) && !defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmt_gauge_set(ctx->darwin_internal_bytes, ts,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ps * vm_stat.internal_page_count, 0, NULL);
</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;'>+ cmt_gauge_set(ctx->darwin_wired_bytes, ts,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ps * vm_stat.wire_count, 0, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (MAC_OS_X_VERSION_MIN_REQUIRED >= 1060) && !defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmt_gauge_set(ctx->darwin_purgeable_bytes, ts,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ps * vm_stat.purgeable_count, 0, NULL);
</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;'>+ cmt_counter_set(ctx->darwin_pageins_bytes, ts,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ps * vm_stat.pageins, 0, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>