debian: link libatomic unconditionally

libatomic, being shipped as part of gcc, should be available on all
platforms (even if they don't need it.)  Or so I hope, at least...

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/debian/changelog b/debian/changelog
index 53cc8bd8ab94b603686612262b649b0d9ea9e8ec..fb1f1d74b578e0cbab4f24ad9a02fd0a479ee121 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ frr (10.0-1) UNRELEASED; urgency=medium
   * added mkdir+chown /var/lib/frr which is now used by FRR
   * sysconfdir and localstatedir configure args are no longer needed
   * NB: refer to never-released 8.5.2-1 changes below!
+  * Link libatomic unconditionally (closes: #1067077)
 
  -- David Lamparter <equinox-debian@diac24.net>  Tue, 30 Apr 2024 16:34:16 +0200
 

diff --git a/debian/rules b/debian/rules
index 9c8ab9f771d9415c93f004d3fc0cd6f84c0e313b..fa0e7beaa60a3d1eebbb5afc04d2d873d4baeea8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,6 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mipsel powerpc sh4))
-  export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
-endif
-
 ifneq (,$(filter terse,$(DEB_BUILD_OPTIONS)))
   MAKE_SILENT="V=0"
   export DH_VERBOSE=0
@@ -43,7 +39,7 @@ export PYTHON=python3
        dh $@ -Bbuild --with=sphinxdoc
 
 override_dh_auto_configure:
-       $(shell dpkg-buildflags --export=sh); \
+       $(shell dpkg-buildflags --export=sh); export LIBS="$$LIBS -latomic"; \
        dh_auto_configure -- \
                --sbindir=/usr/lib/frr \
                --with-vtysh-pager=/usr/bin/pager \