d/rules: Fix armel buildd

diff --git a/debian/changelog b/debian/changelog
index d40543a3bb4736ed8ec6bc1239a712bcc0bcaf66..94ae8977dde0417bc392e3bc67b2c4840af5d852 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dcmtk (3.6.7-10) UNRELEASED; urgency=medium
+
+  * Fix build on armel.  Closes: #1060104
+
+ -- Sebastien Jodogne <s.jodogne@gmail.com>  Tue, 19 Mar 2024 11:03:28 +0100
+
 dcmtk (3.6.7-9.1) unstable; urgency=medium
 
   * Non-maintainer upload.

diff --git a/debian/libdcmtk17t64.lintian-overrides b/debian/libdcmtk17t64.lintian-overrides
index eb93b31a57c862e42df82be4c7ba4d9aef475bcc..85e79be757922b57d91d74437326d6551dee7928 100644 (file)
--- a/debian/libdcmtk17t64.lintian-overrides
+++ b/debian/libdcmtk17t64.lintian-overrides
@@ -3,4 +3,3 @@
 libdcmtk17t64: package-name-doesnt-match-sonames
 libdcmtk17t64: embedded-library
 libdcmtk17t64: no-symbols-control-file
-libdcmtk17t64: package-name-doesnt-match-sonames libdcmtk17

diff --git a/debian/rules b/debian/rules
index ecefa16f1ba760fc8987a9e8233fb1fb112b41db..76e81c1315094bdf03def037a024ec99a8764bdd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,13 @@
 #export DH_VERBOSE=1
 
 # export DEB_BUILD_MAINT_OPTIONS = hardening=+pie
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+ifeq ($(DEB_TARGET_ARCH),armel)
+  # https://lists.debian.org/debian-arm/2024/01/msg00031.html
+  # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1060104
+  export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-stackclash optimize=+lto
+else
+  export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
+endif
 
 # needed for the tests
 export DCMDICTPATH=$(CURDIR)/dcmdata/data/dicom.dic