diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2024-04-30 16:52:48 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2024-04-30 18:09:24 +0200 |
| commit | c2b12ccaa57a65725ba57cbbe391dba7beba9888 (patch) | |
| tree | 403bd541914b022c4da47b669e47fbec40c26e44 | |
| parent | a02a7de44ae46d6688b2ab9df4bd3901eae370f2 (diff) | |
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>
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/rules | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 53cc8bd8ab..fb1f1d74b5 100644 --- 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 9c8ab9f771..fa0e7beaa6 100755 --- 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 \ |