summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 06:07:46 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 06:07:46 +0000
commit378f52d84af0750b34bb07957445570da27ca9c3 (patch)
tree3444db5db800f7e5b2328d26e62c8d8dd814a18b
parentReleasing progress-linux version 10.0-0.1~progress7.99u1. (diff)
downloadfrr-378f52d84af0750b34bb07957445570da27ca9c3.tar.xz
frr-378f52d84af0750b34bb07957445570da27ca9c3.zip
Merging debian version 10.0-0.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog7
-rwxr-xr-xdebian/rules4
2 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c5ac5b8..2f62ab4 100644
--- 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~progress7.99u1) graograman-backports; urgency=medium
* Uploading to graograman-backports, remaining changes:
diff --git a/debian/rules b/debian/rules
index d35ee12..d18f144 100755
--- 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