diff -Nru 389-ds-base-1.4.4.9/debian/changelog 389-ds-base-1.4.4.9/debian/changelog --- 389-ds-base-1.4.4.9/debian/changelog 2020-12-18 13:29:20.000000000 +0000 +++ 389-ds-base-1.4.4.9/debian/changelog 2020-12-20 11:52:36.000000000 +0000 @@ -1,3 +1,10 @@ +389-ds-base (1.4.4.9-1+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 1.4.0.19-2+rpi1 by Peter Michael Green at Thu, 27 Dec 2018 01:27:25 +0000] + * Add -latomic to LDFLAGS on armhf too. + + -- Raspbian forward porter Sun, 20 Dec 2020 11:52:36 +0000 + 389-ds-base (1.4.4.9-1) unstable; urgency=medium * New upstream release. diff -Nru 389-ds-base-1.4.4.9/debian/rules 389-ds-base-1.4.4.9/debian/rules --- 389-ds-base-1.4.4.9/debian/rules 2020-12-18 12:59:30.000000000 +0000 +++ 389-ds-base-1.4.4.9/debian/rules 2020-12-20 11:52:36.000000000 +0000 @@ -4,7 +4,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+pie -ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mips mipsel powerpc powerpcspe sh4)) +ifneq (,$(filter $(DEB_HOST_ARCH), armhf armel m68k mips mipsel powerpc powerpcspe sh4)) export DEB_LDFLAGS_MAINT_APPEND=-latomic endif