* Re: [Buildroot] [PATCH 1/1] package/fluent-bit: fix build without c++
2023-07-27 21:20 [Buildroot] [PATCH 1/1] package/fluent-bit: fix build without c++ Bernd Kuhls
@ 2023-07-28 5:01 ` Thomas Devoogdt
2023-07-28 9:36 ` [Buildroot] [PATCH] " Thomas Devoogdt
1 sibling, 0 replies; 4+ messages in thread
From: Thomas Devoogdt @ 2023-07-28 5:01 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Thomas Devoogdt, buildroot
[-- Attachment #1.1: Type: text/plain, Size: 1546 bytes --]
Hi Bernd,
I know, I have a PR open for this upstream.
https://github.com/confluentinc/librdkafka/pull/4366
Which will then be added to fluent-bit.
https://github.com/fluent/fluent-bit/compare/master...ThomasDevoogdt:fluent-bit:bugfix/7741-librdkafka-without-cxx-support
The last one could then be applied in buildroot as a patch, or will be part
of a next fluent-bit release.
This is the issue which I originally submitted:
https://github.com/fluent/fluent-bit/issues/7741
Kr,
Thomas Devoogdt
Op do 27 jul. 2023 23:20 schreef Bernd Kuhls <bernd@kuhls.net>:
> The kafka plugin needs c++.
>
> Fixes:
>
> http://autobuild.buildroot.net/results/709/70960056479eab860e94eed993566fcb78c4dbbe/
>
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> package/fluent-bit/fluent-bit.mk | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/
> fluent-bit.mk
> index 1185860661..245f6ecf44 100644
> --- a/package/fluent-bit/fluent-bit.mk
> +++ b/package/fluent-bit/fluent-bit.mk
> @@ -22,6 +22,16 @@ FLUENT_BIT_CONF_OPTS += \
> -DFLB_PREFER_SYSTEM_LIBS=Yes \
> -DFLB_BACKTRACE=No
>
> +ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
> +FLUENT_BIT_CONF_OPTS += \
> + -DFLB_IN_KAFKA=Yes \
> + -DFLB_OUT_KAFKA=Yes
> +else
> +FLUENT_BIT_CONF_OPTS += \
> + -DFLB_IN_KAFKA=No \
> + -DFLB_OUT_KAFKA=No
> +endif
> +
> ifeq ($(BR2_PACKAGE_FLUENT_BIT_WASM),y)
> FLUENT_BIT_WAMR_ARCH = $(call qstrip,$(BR2_PACKAGE_FLUENT_BIT_WASM_ARCH))
>
> --
> 2.39.2
>
>
>
[-- Attachment #1.2: Type: text/html, Size: 3229 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH] package/fluent-bit: fix build without c++
2023-07-27 21:20 [Buildroot] [PATCH 1/1] package/fluent-bit: fix build without c++ Bernd Kuhls
2023-07-28 5:01 ` Thomas Devoogdt
@ 2023-07-28 9:36 ` Thomas Devoogdt
2023-07-28 19:32 ` Thomas Petazzoni via buildroot
1 sibling, 1 reply; 4+ messages in thread
From: Thomas Devoogdt @ 2023-07-28 9:36 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Devoogdt, Bernd Kuhls
FLB_{IN,OUT}_KAFKA is enabled by default since v2.1.5,
causing compile errors if no c++ support.
These patches allow the Kafka plugin to be build without C++.
Fixes:
- http://autobuild.buildroot.net/results/d63/d638390da721eb3bdfcc7a4229114b492aaead99/
- http://autobuild.buildroot.net/results/709/70960056479eab860e94eed993566fcb78c4dbbe/
- http://autobuild.buildroot.net/results/366/3667126ee954f927f83ccfbaae3c6fb8ebd07dbb/
- http://autobuild.buildroot.net/results/9bd/9bd090216b9a8005fc3d020a9c0adf5e825bea59/
- ...
Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
---
...MakeLists.txt-allow-compilation-with.patch | 117 ++++++++++++++++++
...isable-cxx-support-for-librdkafka-77.patch | 29 +++++
2 files changed, 146 insertions(+)
create mode 100644 package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch
create mode 100644 package/fluent-bit/0003-CMakeLists.txt-disable-cxx-support-for-librdkafka-77.patch
diff --git a/package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch b/package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch
new file mode 100644
index 0000000000..a315fbf7ef
--- /dev/null
+++ b/package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch
@@ -0,0 +1,117 @@
+From d5492ae7a0fa4e2c19b1d091ad28133fed53d8e2 Mon Sep 17 00:00:00 2001
+From: Thomas Devoogdt <thomas.devoogdt@barco.com>
+Date: Tue, 25 Jul 2023 09:10:41 +0200
+Subject: [PATCH] lib: librdkafka: CMakeLists.txt: allow compilation without
+ CXX support #7741
+
+e.g. fluent-bit is a c-only library, so allow compilation without cxx
+
+Upstream: https://github.com/confluentinc/librdkafka/pull/4366
+Upstream: https://github.com/fluent/fluent-bit/pull/7765
+Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
+---
+ lib/librdkafka-2.1.0/CMakeLists.txt | 18 ++++++++++--
+ lib/librdkafka-2.1.0/examples/CMakeLists.txt | 30 +++++++++++++-------
+ 2 files changed, 35 insertions(+), 13 deletions(-)
+
+diff --git a/lib/librdkafka-2.1.0/CMakeLists.txt b/lib/librdkafka-2.1.0/CMakeLists.txt
+index 7f3dd0fc6..c1ee93062 100644
+--- a/lib/librdkafka-2.1.0/CMakeLists.txt
++++ b/lib/librdkafka-2.1.0/CMakeLists.txt
+@@ -3,7 +3,12 @@ cmake_minimum_required(VERSION 3.2)
+ include("packaging/cmake/parseversion.cmake")
+ parseversion("src/rdkafka.h")
+
+-project(RdKafka VERSION ${RDKAFKA_VERSION})
++project(RdKafka VERSION ${RDKAFKA_VERSION} LANGUAGES C)
++
++option(RDKAFKA_BUILD_CXX "Enable CXX support" ON)
++if(RDKAFKA_BUILD_CXX)
++ enable_language(CXX)
++endif()
+
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/packaging/cmake/Modules/")
+
+@@ -181,7 +186,11 @@ endif()
+
+ option(RDKAFKA_BUILD_STATIC "Build static rdkafka library" OFF)
+ option(RDKAFKA_BUILD_EXAMPLES "Build examples" ON)
+-option(RDKAFKA_BUILD_TESTS "Build tests" ON)
++
++if(RDKAFKA_BUILD_CXX)
++ option(RDKAFKA_BUILD_TESTS "Build tests" ON)
++endif()
++
+ if(WIN32)
+ option(WITHOUT_WIN32_CONFIG "Avoid including win32_config.h on cmake builds" ON)
+ endif(WIN32)
+@@ -279,7 +288,10 @@ install(
+ )
+
+ add_subdirectory(src)
+-add_subdirectory(src-cpp)
++
++if(RDKAFKA_BUILD_CXX)
++ add_subdirectory(src-cpp)
++endif()
+
+ if(RDKAFKA_BUILD_EXAMPLES)
+ add_subdirectory(examples)
+diff --git a/lib/librdkafka-2.1.0/examples/CMakeLists.txt b/lib/librdkafka-2.1.0/examples/CMakeLists.txt
+index bbbb89ad9..51b8b04be 100644
+--- a/lib/librdkafka-2.1.0/examples/CMakeLists.txt
++++ b/lib/librdkafka-2.1.0/examples/CMakeLists.txt
+@@ -5,8 +5,10 @@ endif(WIN32)
+ add_executable(producer producer.c ${win32_sources})
+ target_link_libraries(producer PUBLIC rdkafka)
+
+-add_executable(producer_cpp producer.cpp ${win32_sources})
+-target_link_libraries(producer_cpp PUBLIC rdkafka++)
++if(RDKAFKA_BUILD_CXX)
++ add_executable(producer_cpp producer.cpp ${win32_sources})
++ target_link_libraries(producer_cpp PUBLIC rdkafka++)
++endif()
+
+ add_executable(consumer consumer.c ${win32_sources})
+ target_link_libraries(consumer PUBLIC rdkafka)
+@@ -14,14 +16,20 @@ target_link_libraries(consumer PUBLIC rdkafka)
+ add_executable(rdkafka_performance rdkafka_performance.c ${win32_sources})
+ target_link_libraries(rdkafka_performance PUBLIC rdkafka)
+
+-add_executable(rdkafka_example_cpp rdkafka_example.cpp ${win32_sources})
+-target_link_libraries(rdkafka_example_cpp PUBLIC rdkafka++)
++if(RDKAFKA_BUILD_CXX)
++ add_executable(rdkafka_example_cpp rdkafka_example.cpp ${win32_sources})
++ target_link_libraries(rdkafka_example_cpp PUBLIC rdkafka++)
++endif()
+
+-add_executable(rdkafka_complex_consumer_example_cpp rdkafka_complex_consumer_example.cpp ${win32_sources})
+-target_link_libraries(rdkafka_complex_consumer_example_cpp PUBLIC rdkafka++)
++if(RDKAFKA_BUILD_CXX)
++ add_executable(rdkafka_complex_consumer_example_cpp rdkafka_complex_consumer_example.cpp ${win32_sources})
++ target_link_libraries(rdkafka_complex_consumer_example_cpp PUBLIC rdkafka++)
++endif()
+
+-add_executable(openssl_engine_example_cpp openssl_engine_example.cpp ${win32_sources})
+-target_link_libraries(openssl_engine_example_cpp PUBLIC rdkafka++)
++if(RDKAFKA_BUILD_CXX)
++ add_executable(openssl_engine_example_cpp openssl_engine_example.cpp ${win32_sources})
++ target_link_libraries(openssl_engine_example_cpp PUBLIC rdkafka++)
++endif()
+
+ add_executable(misc misc.c ${win32_sources})
+ target_link_libraries(misc PUBLIC rdkafka)
+@@ -35,6 +43,8 @@ if(NOT WIN32)
+ add_executable(rdkafka_complex_consumer_example rdkafka_complex_consumer_example.c)
+ target_link_libraries(rdkafka_complex_consumer_example PUBLIC rdkafka)
+
+- add_executable(kafkatest_verifiable_client kafkatest_verifiable_client.cpp)
+- target_link_libraries(kafkatest_verifiable_client PUBLIC rdkafka++)
++ if(RDKAFKA_BUILD_CXX)
++ add_executable(kafkatest_verifiable_client kafkatest_verifiable_client.cpp)
++ target_link_libraries(kafkatest_verifiable_client PUBLIC rdkafka++)
++ endif()
+ endif(NOT WIN32)
+--
+2.34.1
+
diff --git a/package/fluent-bit/0003-CMakeLists.txt-disable-cxx-support-for-librdkafka-77.patch b/package/fluent-bit/0003-CMakeLists.txt-disable-cxx-support-for-librdkafka-77.patch
new file mode 100644
index 0000000000..0022d5929c
--- /dev/null
+++ b/package/fluent-bit/0003-CMakeLists.txt-disable-cxx-support-for-librdkafka-77.patch
@@ -0,0 +1,29 @@
+From f5303533fb64bf038dbd8203ac52d94819346239 Mon Sep 17 00:00:00 2001
+From: Thomas Devoogdt <thomas.devoogdt@barco.com>
+Date: Tue, 25 Jul 2023 10:00:36 +0200
+Subject: [PATCH] CMakeLists.txt: disable cxx support for librdkafka #7741
+
+Fluent-bit is c only, so no need to compile cxx.
+This fixes also a compile error in buildroot.
+
+Upstream: https://github.com/fluent/fluent-bit/pull/7765/commits
+Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index df6b283cf..10e6071f3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -967,6 +967,7 @@ if(FLB_BACKTRACE)
+ endif()
+
+ if(FLB_IN_KAFKA OR FLB_OUT_KAFKA)
++ FLB_OPTION(RDKAFKA_BUILD_CXX Off)
+ FLB_OPTION(RDKAFKA_BUILD_STATIC On)
+ FLB_OPTION(RDKAFKA_BUILD_EXAMPLES Off)
+ FLB_OPTION(RDKAFKA_BUILD_TESTS Off)
+--
+2.34.1
+
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread