summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-11-03 09:36:18 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-11-03 09:36:18 +0000
commit465a994c0a15e042755ec0560659291bbeb1dc5c (patch)
tree864d49edfe364a876372df4c856edc1630d1dfbc
parentReleasing progress-linux version 2.11.1-1~progress5+u1. (diff)
downloadicinga2-465a994c0a15e042755ec0560659291bbeb1dc5c.tar.xz
icinga2-465a994c0a15e042755ec0560659291bbeb1dc5c.zip
Merging debian version 2.11.1-2~exp1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog7
-rwxr-xr-xdebian/rules5
2 files changed, 12 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index ccb98aa..1884d8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+icinga2 (2.11.1-2~exp1) experimental; urgency=medium
+
+ * Team upload.
+ * Add -latomic to LDFLAGS on some architectures to fix FTFBS.
+
+ -- Bas Couwenberg <sebastic@debian.org> Fri, 18 Oct 2019 16:32:56 +0200
+
icinga2 (2.11.1-1~progress5+u1) engywuck-backports; urgency=medium
* Uploading to engywuck-backports, remaining changes:
diff --git a/debian/rules b/debian/rules
index 818d70d..4771c90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
export CTEST_OUTPUT_ON_FAILURE=1
@@ -14,6 +15,10 @@ ifneq (,$(findstring $(DEB_BUILD_ARCH),"armhf mips mipsel"))
UNITY_BUILD = -DICINGA2_UNITY_BUILD=Off
endif
+ifneq (,$(filter $(DEB_HOST_ARCH),armel m68k mips mipsel powerpc powerpcspe sh4))
+ export DEB_LDFLAGS_MAINT_APPEND = -latomic
+endif
+
%:
dh $@ --with systemd --with bash_completion --parallel