NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/fluent-bit: drop cxx handling

Browse Source 
Fluent-bit is written in pure c, so drop any cxx handling. Only the wasm
part needs c++, but that one doesn't need the fixes which are now dropped.

Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Thomas Devoogdt 2023-07-23 11:23:13 +02:00 committed by Thomas Petazzoni
parent 249efb46fc
commit 7252098696
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/fluent-bit/fluent-bit.mk
View File

@ -13,7 +13,6 @@ FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit
FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml openssl FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml openssl
FLUENT_BIT_CFLAGS = $(TARGET_CFLAGS) FLUENT_BIT_CFLAGS = $(TARGET_CFLAGS)
FLUENT_BIT_CXXFLAGS = $(TARGET_CXXFLAGS)
FLUENT_BIT_CONF_OPTS += \ FLUENT_BIT_CONF_OPTS += \
-DFLB_DEBUG=No \ -DFLB_DEBUG=No \
@ -49,13 +48,11 @@ FLUENT_BIT_CONF_OPTS += \
# Fix multiple definition of `mk_tls_*'. # Fix multiple definition of `mk_tls_*'.
# https://github.com/fluent/fluent-bit/issues/5537 # https://github.com/fluent/fluent-bit/issues/5537
FLUENT_BIT_CFLAGS += -fcommon FLUENT_BIT_CFLAGS += -fcommon
FLUENT_BIT_CXXFLAGS += -fcommon
# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h # Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h
# large file support. # large file support.
# https://bugzilla.redhat.com/show_bug.cgi?id=574992 # https://bugzilla.redhat.com/show_bug.cgi?id=574992
FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS
FLUENT_BIT_CXXFLAGS += -U_FILE_OFFSET_BITS
ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) ifeq ($(BR2_PACKAGE_LIBEXECINFO),y)
FLUENT_BIT_DEPENDENCIES += libexecinfo FLUENT_BIT_DEPENDENCIES += libexecinfo
@ -74,8 +71,7 @@ endif
FLUENT_BIT_CONF_OPTS += \ FLUENT_BIT_CONF_OPTS += \
-DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" \ -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" \
-DCMAKE_C_FLAGS="$(FLUENT_BIT_CFLAGS)" \ -DCMAKE_C_FLAGS="$(FLUENT_BIT_CFLAGS)"
-DCMAKE_CXX_FLAGS="$(FLUENT_BIT_CXXFLAGS)"
define FLUENT_BIT_INSTALL_INIT_SYSV define FLUENT_BIT_INSTALL_INIT_SYSV
$(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \