diff -Nru haproxy-2.2.9/debian/changelog haproxy-2.2.9/debian/changelog --- haproxy-2.2.9/debian/changelog 2021-05-27 13:00:01.000000000 +0000 +++ haproxy-2.2.9/debian/changelog 2021-06-17 15:23:45.000000000 +0000 @@ -1,3 +1,10 @@ +haproxy (2.2.9-2+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 1.8.19-1+rpi1 by Peter Michael Green at Thu, 14 Mar 2019 20:25:01 +0000] + * Link with libatomic on armhf too. + + -- Raspbian forward porter Thu, 17 Jun 2021 15:23:45 +0000 + haproxy (2.2.9-2) unstable; urgency=medium * d/patches: fix agent-check regression putting down servers. diff -Nru haproxy-2.2.9/debian/rules haproxy-2.2.9/debian/rules --- haproxy-2.2.9/debian/rules 2021-05-27 13:00:01.000000000 +0000 +++ haproxy-2.2.9/debian/rules 2021-06-17 15:23:45.000000000 +0000 @@ -33,7 +33,7 @@ MAKEARGS+= USE_REGPARM=1 endif -ifneq ($(filter armel mips mipsel m68k powerpc powerpcspe sh4 riscv64,$(DEB_HOST_ARCH)),) +ifneq ($(filter armel armhf mips mipsel m68k powerpc powerpcspe sh4 riscv64,$(DEB_HOST_ARCH)),) MAKEARGS+= ADDLIB="-latomic -Wl,--no-as-needed -lgcc_s -Wl,--as-needed" else MAKEARGS+= ADDLIB="-Wl,--no-as-needed -lgcc_s -Wl,--as-needed"