debian: pull in 10.0-0.2 as uploaded on Debian

(again, FRR upstream not merged at this point)

Authored-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/debian/changelog b/debian/changelog
index d16afb04ff32c0a2d0a25d2d57cfbeecc252e71a..3fdc74e5204f15c7b37ad60d4cfcdb4a4bfbd481 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+frr (10.0-0.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Linking with atomic like armel to fix FTBFS.
+
+ -- Daniel Baumann <daniel.baumann@progress-linux.org>  Sat, 27 Apr 2024 07:44:24 +0200
+
 frr (10.0-0.1) unstable; urgency=medium
 
   * Non-maintainer upload.

diff --git a/debian/rules b/debian/rules
index d35ee12f366bbb83c4b5c656713def20d4b559ee..d18f144a01c5ba1aae7cfdf9c8e9bdd23dda06d2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,10 @@
 
 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