From 1c59aa826d738a2ba37afd730f92ffecfa1e5a8d Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Sat, 12 Mar 2022 21:13:38 +0000 Subject: [PATCH] use no-as-needed when linking libatomic to work around library ordering issue. --- debian/changelog | 3 +++ debian/rules | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9dfa7cd..08a07b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ giada (0.20.1+ds1-1+rpi1) bookworm-staging; urgency=medium [changes brought forward from 0.15.2+ds1-2+rpi1 by Peter Michael Green at Sun, 17 Mar 2019 13:18:55 +0000] * Link against libatomic on armhf too for raspbian. + [changes introduced in 0.20.1+ds1-1+rpi1 by Peter Michael Green] + * Use no-as-needed when linking with libatomic to workaround library ordering issue. + -- Raspbian forward porter Fri, 11 Mar 2022 14:12:06 +0000 giada (0.20.1+ds1-1) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index b5dd035..99dfcba 100755 --- a/debian/rules +++ b/debian/rules @@ -33,7 +33,7 @@ DEB_CXXFLAGS_MAINT_APPEND += $(shell pkg-config --cflags libjpeg libpng libcurl noatomicarch = $(shell dpkg-architecture -qDEB_HOST_ARCH | egrep -x "(armel|armhf|powerpc|powerpcspe|m68k|mips|mipsel|sh4|riscv64)") # link with libatomic on architectures without built-in atomic ifeq ($(if $(noatomicarch),atomic), atomic) - LIBS += -latomic + LIBS += -Wl,-push-state -Wl,-no-as-needed -latomic -Wl,-pop-state endif DEB_LDFLAGS_MAINT_APPEND += $(LIBS) -- 2.30.2