From 75846d63725e1c098511826524b5b33d4772b7f3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 13 Jan 2024 11:06:54 +0100 Subject: [PATCH] package/apcupsd: set LD to TARGET_CXX As found out by Yann E. Morin in [1], apcupsd configure script is ugly, and uses gcc to do the link line-wrapping which will raise the following build failure with gcc 13: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64le-buildroot-linux-gnu/13.2.0/../../../../powerpc64le-buildroot-linux-gnu/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64le-buildroot-linux-gnu/13.2.0/../../../../powerpc64le-buildroot-linux-gnu/lib/../lib64/libsupc++.a(eh_alloc.o): in function `std::basic_string_view >::compare(unsigned long, unsigned long, char const*, unsigned long) const': eh_alloc.cc:(.text._ZNKSt17basic_string_viewIcSt11char_traitsIcEE7compareEmmPKcm[_ZNKSt17basic_string_viewIcSt11char_traitsIcEE7compareEmmPKcm]+0x44): undefined reference to `std::__throw_out_of_range_fmt(char const*, ...)' It will also raise the following build failure on sparc/arc: /home/autobuild/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arceb-snps-linux-uclibc/9.2.1/../../../../arceb-snps-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-3/output-1/host/arceb-buildroot-linux-uclibc/sysroot/lib/libsupc++.a(eh_throw.o): in function `__exchange_and_add_dispatch': /SCRATCH/arcjenkins2/slaves/ru20-custom-arcgnu2/workspace/arcoss_verification/arc_gnu_toolchain_release/arc_gnu_toolchain_release/bd-uclibceb/gcc-stage2/arceb-snps-linux-uclibc/libstdc++-v3/include/ext/atomicity.h:82: undefined reference to `__gnu_cxx::__exchange_and_add(int volatile*, int)' /home/autobuild/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arceb-snps-linux-uclibc/9.2.1/../../../../arceb-snps-linux-uclibc/bin/ld: /SCRATCH/arcjenkins2/slaves/ru20-custom-arcgnu2/workspace/arcoss_verification/arc_gnu_toolchain_release/arc_gnu_toolchain_release/bd-uclibceb/gcc-stage2/arceb-snps-linux-uclibc/libstdc++-v3/include/ext/atomicity.h:82: undefined reference to `__gnu_cxx::__exchange_and_add(int volatile*, int)' Instead of trying to patch the configure script as advocated by Yann E. Morin, set LD to TARGET_CXX as: - this solution is quicker - usptream is dead (last release in 2016) - this solution has already been used in other packages (nodejs, zmqpp) [1]: https://patchwork.ozlabs.org/project/buildroot/patch/20200812171821.2517-1-Evgeniy.Didin@synopsys.com/ Fixes: - http://autobuild.buildroot.org/results/6096c3ddc5edf3204635c2c90246c2e8c8e074e7 - http://autobuild.buildroot.org/results/d8a/d8a3ab31c5b86871c7e1117f4ffa7b6cedfcb7e0/build-end.log Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit cd2dcaa6c68639470a5db806878a6baba2e15741) Signed-off-by: Peter Korsgaard --- package/apcupsd/apcupsd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/apcupsd/apcupsd.mk b/package/apcupsd/apcupsd.mk index 80ed0b0832..97e6d6a558 100644 --- a/package/apcupsd/apcupsd.mk +++ b/package/apcupsd/apcupsd.mk @@ -71,8 +71,8 @@ APCUPSD_CONF_OPTS += --disable-usb endif define APCUPSD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/platforms + $(TARGET_MAKE_ENV) $(MAKE) LD="$(TARGET_CXX)" -C $(@D)/src + $(TARGET_MAKE_ENV) $(MAKE) LD="$(TARGET_CXX)" -C $(@D)/platforms endef define APCUPSD_INSTALL_TARGET_CMDS