all: fix building fluent-bit using cmake version 4.0.2

3 files changed, 340 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ad4dee6..556e4c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -24,11 +24,13 @@ pkgbase = google-cloud-ops-agent-git
 	source = opentelemetry-java-contrib::git+https://github.com/open-telemetry/opentelemetry-java-contrib.git
 	source = 0001-build-sh.patch
 	source = 0002-builds_otel.sh.patch
+	source = 0003-fluent-bit.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = ba66d01b8058644597d9b406d3b8ce7ed40aed77c7358f2b97ff0e262a4cbb98
 	sha256sums = 0e663cc6bbfdb5af962001b4645c3c154f715874fb910adfb3b3293564383f14
+	sha256sums = c75c0d786009829897cf6ba001d8e223cc5d4923062007fcda2b7c0c1669713a
 
 pkgname = google-cloud-ops-agent-git
diff --git a/0003-fluent-bit.patch b/0003-fluent-bit.patch
new file mode 100644
index 0000000..0b3186d
--- /dev/null
+++ b/0003-fluent-bit.patch
@@ -0,0 +1,331 @@
+diff --git a/lib/avro/CMakeLists.txt b/lib/avro/CMakeLists.txt
+index 36b0a0283..2e41fbca6 100644
+--- a/lib/avro/CMakeLists.txt
++++ b/lib/avro/CMakeLists.txt
+@@ -16,7 +16,7 @@
+ # specific language governing permissions and limitations
+ # under the License.
+ #
+-cmake_minimum_required(VERSION 3.1)
++cmake_minimum_required(VERSION 3.5)
+ project(AvroC C)
+ enable_testing()
+ 
+diff --git a/lib/cfl/lib/xxhash/cmake_unofficial/CMakeLists.txt b/lib/cfl/lib/xxhash/cmake_unofficial/CMakeLists.txt
+index d5456b018..2d8b28199 100644
+--- a/lib/cfl/lib/xxhash/cmake_unofficial/CMakeLists.txt
++++ b/lib/cfl/lib/xxhash/cmake_unofficial/CMakeLists.txt
+@@ -5,7 +5,7 @@
+ #
+ # For details, see <https://creativecommons.org/publicdomain/zero/1.0/>.
+ 
+-cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
++cmake_minimum_required (VERSION 3.5)
+ 
+ set(XXHASH_DIR "${CMAKE_CURRENT_SOURCE_DIR}/..")
+ 
+diff --git a/lib/chunkio/CMakeLists.txt b/lib/chunkio/CMakeLists.txt
+index dbc7d4805..f217fa1ed 100644
+--- a/lib/chunkio/CMakeLists.txt
++++ b/lib/chunkio/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.5)
+ project(chunk-io C)
+ 
+ set(CIO_VERSION_MAJOR  1)
+diff --git a/lib/chunkio/cmake/sanitizers-cmake/CMakeLists.txt b/lib/chunkio/cmake/sanitizers-cmake/CMakeLists.txt
+index a19285255..087051b2a 100644
+--- a/lib/chunkio/cmake/sanitizers-cmake/CMakeLists.txt
++++ b/lib/chunkio/cmake/sanitizers-cmake/CMakeLists.txt
+@@ -30,7 +30,7 @@
+ #
+ 
+ # minimum required cmake version
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # project name
+ project("CMake-sanitizers")
+diff --git a/lib/chunkio/tests/lib/acutest/CMakeLists.txt b/lib/chunkio/tests/lib/acutest/CMakeLists.txt
+index 4a741a424..5d2033698 100644
+--- a/lib/chunkio/tests/lib/acutest/CMakeLists.txt
++++ b/lib/chunkio/tests/lib/acutest/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ 
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.5)
+ project(Acutest C CXX)
+ 
+ 
+diff --git a/lib/cmetrics/CMakeLists.txt b/lib/cmetrics/CMakeLists.txt
+index f5221d7f5..50c675d75 100644
+--- a/lib/cmetrics/CMakeLists.txt
++++ b/lib/cmetrics/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.5)
+ project(cmetrics C)
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+diff --git a/lib/ctraces/CMakeLists.txt b/lib/ctraces/CMakeLists.txt
+index 3cef9282f..0d1977281 100644
+--- a/lib/ctraces/CMakeLists.txt
++++ b/lib/ctraces/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.5)
+ project(ctraces C)
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+diff --git a/lib/fluent-otel-proto/CMakeLists.txt b/lib/fluent-otel-proto/CMakeLists.txt
+index aae43bc00..637c23d49 100644
+--- a/lib/fluent-otel-proto/CMakeLists.txt
++++ b/lib/fluent-otel-proto/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 4.0)
+ project(fluent-opentelemetry-proto C)
+ 
+ # Include helpers
+diff --git a/lib/jansson-e23f558/CMakeLists.txt b/lib/jansson-e23f558/CMakeLists.txt
+index ed33e3c47..74d8fdc19 100644
+--- a/lib/jansson-e23f558/CMakeLists.txt
++++ b/lib/jansson-e23f558/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required (VERSION 3.1)
++cmake_minimum_required (VERSION 3.5)
+ project(jansson C)
+ 
+ # Options
+diff --git a/lib/librdkafka-2.4.0/CMakeLists.txt b/lib/librdkafka-2.4.0/CMakeLists.txt
+index 7f3dd0fc6..f3d05bad7 100644
+--- a/lib/librdkafka-2.4.0/CMakeLists.txt
++++ b/lib/librdkafka-2.4.0/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.2)
++cmake_minimum_required(VERSION 3.5)
+ 
+ include("packaging/cmake/parseversion.cmake")
+ parseversion("src/rdkafka.h")
+diff --git a/lib/lwrb/CMakeLists.txt b/lib/lwrb/CMakeLists.txt
+index 031cbc1dd..2ff87d5a1 100644
+--- a/lib/lwrb/CMakeLists.txt
++++ b/lib/lwrb/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # Setup project
+ project(LwLibPROJECT C)
+diff --git a/lib/miniz/CMakeLists.txt b/lib/miniz/CMakeLists.txt
+index ce6ade1c0..490284842 100644
+--- a/lib/miniz/CMakeLists.txt
++++ b/lib/miniz/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # determine whether this is a standalone project or included by other projects
+ set (MINIZ_STANDALONE_PROJECT ON)
+diff --git a/lib/monkey/CMakeLists.txt b/lib/monkey/CMakeLists.txt
+index f4e88caac..0ad514569 100644
+--- a/lib/monkey/CMakeLists.txt
++++ b/lib/monkey/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ # Let's have fun!
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.5)
+ project(monkey C)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
+ set(CMAKE_INCLUDE_DIRECTORIES_BEFORE ON)
+diff --git a/lib/monkey/mk_core/deps/libevent/CMakeLists.txt b/lib/monkey/mk_core/deps/libevent/CMakeLists.txt
+index 7a839decf..954c423f7 100644
+--- a/lib/monkey/mk_core/deps/libevent/CMakeLists.txt
++++ b/lib/monkey/mk_core/deps/libevent/CMakeLists.txt
+@@ -21,7 +21,7 @@
+ if (WIN32)
+     cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+ else()
+-    cmake_minimum_required(VERSION 2.8.0 FATAL_ERROR)
++    cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+ endif()
+ 
+ if(NOT CMAKE_BUILD_TYPE)
+diff --git a/lib/msgpack-c/CMakeLists.txt b/lib/msgpack-c/CMakeLists.txt
+index ffbbc5ddb..379fac6f8 100644
+--- a/lib/msgpack-c/CMakeLists.txt
++++ b/lib/msgpack-c/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.5)
+ project(msgpack-c C)
+ 
+ set(src
+diff --git a/lib/nghttp2/CMakeLists.txt b/lib/nghttp2/CMakeLists.txt
+index ee4cb0a4a..0ac378d2a 100644
+--- a/lib/nghttp2/CMakeLists.txt
++++ b/lib/nghttp2/CMakeLists.txt
+@@ -22,7 +22,7 @@
+ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.5)
+ # XXX using 1.8.90 instead of 1.9.0-DEV
+ project(nghttp2 VERSION 1.58.90)
+ 
+diff --git a/lib/onigmo/CMakeLists.txt b/lib/onigmo/CMakeLists.txt
+index 66865130a..c2ddc0349 100644
+--- a/lib/onigmo/CMakeLists.txt
++++ b/lib/onigmo/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.5)
+ project(onigmo C)
+ 
+ # Onigmo Version
+diff --git a/lib/snappy-fef67ac/CMakeLists.txt b/lib/snappy-fef67ac/CMakeLists.txt
+index ae9225c49..995bb28d4 100644
+--- a/lib/snappy-fef67ac/CMakeLists.txt
++++ b/lib/snappy-fef67ac/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8)

++cmake_minimum_required(VERSION 3.5)

+ project(snappy-c C)

+ 

+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)

+diff --git a/lib/tutf8e/CMakeLists.txt b/lib/tutf8e/CMakeLists.txt
+index a056ef83c..0c21e6db6 100644
+--- a/lib/tutf8e/CMakeLists.txt
++++ b/lib/tutf8e/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.5)
+ project(tutf8e C)
+ 
+ # Not supported: -std=c90 (lacks support for inline)
+diff --git a/lib/update_msgpack.sh b/lib/update_msgpack.sh
+index fe9b0444c..90759d4a1 100755
+--- a/lib/update_msgpack.sh
++++ b/lib/update_msgpack.sh
+@@ -14,7 +14,7 @@ cp -r /tmp/flb-msgpack-c/cmake msgpack-c/
+ # Register CMakeLists.txt
+ rm msgpack-c/CMakeLists.txt
+ cat << EOF > msgpack-c/CMakeLists.txt
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.5)
+ project(msgpack-c)
+ 
+ set(src
+diff --git a/lib/wasm-micro-runtime-WAMR-1.3.0/CMakeLists.txt b/lib/wasm-micro-runtime-WAMR-1.3.0/CMakeLists.txt
+index 1c8799494..50f757afe 100644
+--- a/lib/wasm-micro-runtime-WAMR-1.3.0/CMakeLists.txt
++++ b/lib/wasm-micro-runtime-WAMR-1.3.0/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # Copyright (C) 2019 Intel Corporation.  All rights reserved.
+ # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ 
+-cmake_minimum_required (VERSION 3.0)
++cmake_minimum_required (VERSION 3.5)
+ 
+ project (iwasm)
+ 
+diff --git a/lib/wasm-micro-runtime-WAMR-1.3.0/product-mini/platforms/android/CMakeLists.txt b/lib/wasm-micro-runtime-WAMR-1.3.0/product-mini/platforms/android/CMakeLists.txt
+index 638b6ab0d..ecd62fae0 100644
+--- a/lib/wasm-micro-runtime-WAMR-1.3.0/product-mini/platforms/android/CMakeLists.txt
++++ b/lib/wasm-micro-runtime-WAMR-1.3.0/product-mini/platforms/android/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # Copyright (C) 2019 Intel Corporation.  All rights reserved.
+ # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ 
+-cmake_minimum_required (VERSION 3.4.1)
++cmake_minimum_required (VERSION 3.5)
+ 
+ set (CMAKE_VERBOSE_MAKEFILE on)
+ set (CMAKE_BUILD_TYPE       Release)
+diff --git a/lib/wasm-micro-runtime-WAMR-1.3.0/product-mini/platforms/vxworks/CMakeLists.txt b/lib/wasm-micro-runtime-WAMR-1.3.0/product-mini/platforms/vxworks/CMakeLists.txt
+index 0dc5d9699..4b85261c4 100644
+--- a/lib/wasm-micro-runtime-WAMR-1.3.0/product-mini/platforms/vxworks/CMakeLists.txt
++++ b/lib/wasm-micro-runtime-WAMR-1.3.0/product-mini/platforms/vxworks/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # Copyright (C) 2019 Intel Corporation.  All rights reserved.
+ # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ 
+-cmake_minimum_required (VERSION 2.9)
++cmake_minimum_required (VERSION 3.5)
+ 
+ project (iwasm)
+ 
+diff --git a/lib/wasm-micro-runtime-WAMR-1.3.0/samples/spawn-thread/wasm-apps/CMakeLists.txt b/lib/wasm-micro-runtime-WAMR-1.3.0/samples/spawn-thread/wasm-apps/CMakeLists.txt
+index 52ee7d752..a71763cb0 100644
+--- a/lib/wasm-micro-runtime-WAMR-1.3.0/samples/spawn-thread/wasm-apps/CMakeLists.txt
++++ b/lib/wasm-micro-runtime-WAMR-1.3.0/samples/spawn-thread/wasm-apps/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # Copyright (C) 2019 Intel Corporation.  All rights reserved.
+ # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ 
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.5)
+ project(wasm-apps)
+ 
+ set(WAMR_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
+diff --git a/lib/wasm-micro-runtime-WAMR-1.3.0/test-tools/host-tool/CMakeLists.txt b/lib/wasm-micro-runtime-WAMR-1.3.0/test-tools/host-tool/CMakeLists.txt
+index 932cf73bd..60ec93814 100644
+--- a/lib/wasm-micro-runtime-WAMR-1.3.0/test-tools/host-tool/CMakeLists.txt
++++ b/lib/wasm-micro-runtime-WAMR-1.3.0/test-tools/host-tool/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ #
+ 
+-cmake_minimum_required (VERSION 2.9)
++cmake_minimum_required (VERSION 3.5)
+ project (host-agent)
+ 
+ if (NOT CMAKE_BUILD_TYPE)
+diff --git a/lib/wasm-micro-runtime-WAMR-1.3.0/test-tools/wamr-ide/VSCode-Extension/resource/scripts/CMakeLists.txt b/lib/wasm-micro-runtime-WAMR-1.3.0/test-tools/wamr-ide/VSCode-Extension/resource/scripts/CMakeLists.txt
+index 81d998bc8..d6a915030 100644
+--- a/lib/wasm-micro-runtime-WAMR-1.3.0/test-tools/wamr-ide/VSCode-Extension/resource/scripts/CMakeLists.txt
++++ b/lib/wasm-micro-runtime-WAMR-1.3.0/test-tools/wamr-ide/VSCode-Extension/resource/scripts/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # Copyright (C) 2019 Intel Corporation.  All rights reserved.
+ # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ 
+-cmake_minimum_required (VERSION 2.9)
++cmake_minimum_required (VERSION 3.5)
+ 
+ project(Main)
+ 
+@@ -29,4 +29,4 @@ set (HEADER_LIST
+ 
+ include_directories(${HEADER_LIST})
+ 
+-add_executable (${OUTPUT_FILE_NAME} ${SRC_LIST})
+\ No newline at end of file
++add_executable (${OUTPUT_FILE_NAME} ${SRC_LIST})
+diff --git a/lib/wasm-micro-runtime-WAMR-1.3.0/wamr-sdk/app/CMakeLists.txt b/lib/wasm-micro-runtime-WAMR-1.3.0/wamr-sdk/app/CMakeLists.txt
+index 2e115cf4c..6ed2ce650 100644
+--- a/lib/wasm-micro-runtime-WAMR-1.3.0/wamr-sdk/app/CMakeLists.txt
++++ b/lib/wasm-micro-runtime-WAMR-1.3.0/wamr-sdk/app/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # Copyright (C) 2019 Intel Corporation.  All rights reserved.
+ # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ 
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.5)
+ project(app-framework)
+ 
+ SET (CMAKE_C_FLAGS "-O3")
+diff --git a/lib/wasm-micro-runtime-WAMR-1.3.0/wamr-sdk/runtime/CMakeLists.txt b/lib/wasm-micro-runtime-WAMR-1.3.0/wamr-sdk/runtime/CMakeLists.txt
+index e8e5c363d..41d88bd4b 100644
+--- a/lib/wasm-micro-runtime-WAMR-1.3.0/wamr-sdk/runtime/CMakeLists.txt
++++ b/lib/wasm-micro-runtime-WAMR-1.3.0/wamr-sdk/runtime/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # Copyright (C) 2019 Intel Corporation.  All rights reserved.
+ # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ 
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.5)
+ project(runtime-sdk)
+ 
+ SET (CMAKE_C_FLAGS          "-O3")
diff --git a/PKGBUILD b/PKGBUILD
index 10c1682..9db2ede 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -38,6 +38,7 @@ source=(
 	"opentelemetry-java-contrib::git+https://github.com/open-telemetry/opentelemetry-java-contrib.git"
 	"0001-build-sh.patch"
 	"0002-builds_otel.sh.patch"
+	"0003-fluent-bit.patch"
 )
 sha256sums=(
 	'SKIP'
@@ -46,6 +47,7 @@ sha256sums=(
 	'SKIP'
 	'ba66d01b8058644597d9b406d3b8ce7ed40aed77c7358f2b97ff0e262a4cbb98'
 	'0e663cc6bbfdb5af962001b4645c3c154f715874fb910adfb3b3293564383f14'
+	'c75c0d786009829897cf6ba001d8e223cc5d4923062007fcda2b7c0c1669713a'
 )
 
 pkgver() {
@@ -81,6 +83,11 @@ build() {
 	CGO_ENABLED=1 ./builds/otel.sh "$_destdir"
 
 	echo "--- Building fluent_bit ..."
+	echo "--- pkgname=${pkgname}"
+	echo "--- pwd=${PWD}"
+	cd "submodules/fluent-bit"
+	git apply "${srcdir}/0003-fluent-bit.patch"
+	cd "../.."
 	./builds/fluent_bit.sh "$_destdir"
 
 	echo "--- Building systemd ..."