From 6f692c548904c5ae130f6e17e303ff4ad0b482b5 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Mon, 30 Jan 2023 13:19:29 +0100 Subject: [PATCH] package/fluent-bit: fix -latomic on various platforms /home/thomas/br-test-pkg/bootlin-nios2-glibc/host/opt/ext-toolchain/bin/../lib/gcc/nios2-buildroot-linux-gnu/10.3.0/../../../../nios2-buildroot-linux-gnu/bin/ld: /tmp/fluent-bit.6F9rEA.ltrans28.ltrans.o: undefined reference to symbol '__atomic_compare_exchange_8@@LIBATOMIC_1.0' /home/thomas/br-test-pkg/bootlin-nios2-glibc/host/opt/ext-toolchain/bin/../lib/gcc/nios2-buildroot-linux-gnu/10.3.0/../../../../nios2-buildroot-linux-gnu/bin/ld: /home/thomas/br-test-pkg/bootlin-nios2-glibc/host/nios2-buildroot-linux-gnu/sysroot/lib/libatomic.so.1: error adding symbols: DSO missing from command line collect2: error: ld returned 1 exit status Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- package/fluent-bit/fluent-bit.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index f7727834dd..c84042a0fa 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -41,6 +41,12 @@ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" +# Uses __atomic_compare_exchange_8 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +FLUENT_BIT_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + define FLUENT_BIT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ $(TARGET_DIR)/etc/init.d/S99fluent-bit