summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-13 09:49:04 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-13 09:49:04 +0000
commitb4dd22738a48f1156a165040de6450fe4a59226a (patch)
treeeacfffa6b2f17bedf41103952f969292a076cc2a /debian
parentReleasing progress-linux version 2.7.2-1~dschinn1. (diff)
downloadknot-b4dd22738a48f1156a165040de6450fe4a59226a.zip
knot-b4dd22738a48f1156a165040de6450fe4a59226a.tar.xz
Merging debian version 2.7.2-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rwxr-xr-xdebian/rules13
2 files changed, 11 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index 9f32884..9f1874a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+knot (2.7.2-2) unstable; urgency=medium
+
+ * d/rules: try moving DEB_HOST_ARCH check for -latomic
+ * mips and powerpc both appear to build fine without -latomic
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Wed, 29 Aug 2018 16:07:02 -0400
+
knot (2.7.2-1~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/rules b/debian/rules
index de856bb..95bb1f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,15 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
-
-# To enable all, uncomment following line
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_CFLAGS_MAINT_APPEND = -Wall -DNDEBUG
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
export DPKG_GENSYMBOLS_CHECK_LEVEL := 4
+ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),riscv64))
+ export DEB_LDFLAGS_MAINT_APPEND += -latomic
+endif
+
include /usr/share/dpkg/default.mk
ifeq (maint,$(filter $(DEB_BUILD_OPTIONS),maint))
@@ -31,10 +30,6 @@ else
RUN_TEST := -timeout --kill-after=5s 5m
endif
-ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),mips powerpc riscv64))
- export DEB_LDFLAGS_MAINT_APPEND += -latomic
-endif
-
%:
dh $@ --dbgsym-migration='knot-dbg (<< 2.2.0-2~)' --exclude=.la --exclude=example.com.zone