[med-svn] [seqan2] 07/07: cleanup build flags

[Michael Crusoe]

This is an automated email from the git hooks/post-receive script.

misterc-guest pushed a commit to branch experimental
in repository seqan2.

commit b19650ac87ba1dc8966cb44770be99fa0b388e22
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Thu Dec 21 00:49:13 2017 -0800

    cleanup build flags
---
 debian/changelog                |  8 ++++++--
 debian/rules                    | 39 +++++++++++++--------------------------
 debian/source/lintian-overrides |  2 +-
 3 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eba39b0..d7b0fb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-seqan2 (2.3.2.000platform-issues9-028fd79+dfsg-1) UNRELEASED; urgency=medium
+seqan2 (2.3.2.000platform-issues9-028fd79+dfsg-1) experimental; urgency=medium
 
   * Another update from upstream
+  * debian/rules: build flags simplification:
+      - use DEB_*_MAINT_APPEND
+      - pass -DNDEBUG -O3 as per upstream
+      - drop -DSEQAN_BUILD_SYSTEM=DEVELOP as that is the default
 
- -- Michael R. Crusoe <michael.crusoe at gmail.com>  Wed, 20 Dec 2017 07:40:16 -0800
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Fri, 22 Dec 2017 00:03:51 -0800
 
 seqan2 (2.3.2.000platform-issues8-6f85721+dfsg-2) experimental; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 09628f3..962cf9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,11 +7,6 @@ export DH_BUILD_MAINT_OPTIONS = hardening=+all
 include /usr/share/dpkg/pkg-info.mk
 export HOME=$(CURDIR)/fakehome
 
-# import hardening, adding CPPFLAGS to CFLAGS, in case dh doesn't
-# See https://wiki.debian.org/Hardening#Notes_for_packages_using_CMake
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-
 # Droping -fstack-protector flag helps **drastically** reducing memory consumption when building the package!!!!
 # export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS | sed 's/-fstack-protector *//')  ## don't do this, it simply triggers #759978
 # export DEB_BUILD_MAINT_OPTIONS = hardening=-stackprotector
@@ -21,24 +16,12 @@ DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 DEB_BUILD_ARCH          ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-# Change this list? Then update debian/README.Debian
-#ifneq (,$(filter armel armhf mips mipsel kfreebsd% hurd% sh4,$(DEB_BUILD_ARCH)))
-#    CXXFLAGS+=-O2
-#    CFLAGS+=-O2
-#else
-#    CXXFLAGS+=-O3
-#    CFLAGS+=-O3
-#endif
-# try optimizing everywhere now that we drop some apps
-CXXFLAGS+=-O3
-CFLAGS+=-O3
-
 ifneq (,$(filter sparc64,$(DEB_HOST_ARCH)))
-    CXXFLAGS+=-D__arch64__=1 -DSEQAN_BIG_ENDIAN=1
+    DEB_CXXFLAGS_MAINT_APPEND+=-D__arch64__=1 -DSEQAN_BIG_ENDIAN=1
 endif
 
 ifneq (,$(filter mips mipsel mips64el,$(DEB_BUILD_ARCH)))
-    CXXFLAGS+=-mxgot
+    DEB_CXXFLAGS_MAINT_APPEND+=-mxgot
 endif
 # Disable parallel building on some build archs to save memory
 ifneq (,$(filter armel armhf sh4 kfreebsd%,$(DEB_BUILD_ARCH)))
@@ -49,22 +32,26 @@ ifneq (,$(filter armel armhf sh4 kfreebsd%,$(DEB_BUILD_ARCH)))
 endif
 $(info $$DEB_BUILD_OPTIONS is [${DEB_BUILD_OPTIONS}])
 
-# ifneq (,$(filter mips64el ppc64el s390x alpha hppa powerpc ppc64 sparc64,$(DEB_HOST_ARCH)))
-# # Disable async io on certain target archs, as per upstream
-# # https://github.com/seqan/seqan/issues/1861#issuecomment-336484553
-#     CXXFLAGS+=-DSEQAN_ASYNC_IO=0
-# endif
+ifneq (,$(filter mips64el ppc64el s390x alpha hppa powerpc ppc64 sparc64,$(DEB_HOST_ARCH)))
+# Disable async io on certain target archs, as per upstream
+# https://github.com/seqan/seqan/issues/1861#issuecomment-336484553
+    DEB_CXXFLAGS_MAINT_APPEND+=-DSEQAN_ASYNC_IO=0
+endif
+
+# As per upstream's instructions
+DEB_CXXFLAGS_MAINT_APPEND+=-DNDEBUG -O3
+export DEB_CFLAGS_MAINT_APPEND+=-O3
+export DEB_CXXFLAGS_MAINT_APPEND DEB_CFLAGS_MAINT_APPEND DEB_BUILD_OPTIONS
 
 pkgapps=seqan-apps
 pkgdev=libseqan2-dev
 
-export CXXFLAGS CFLAGS DEB_BUILD_OPTIONS
 %:
 	dh $@
 
 override_dh_auto_configure-arch:
 	export DEB_BUILD_ARCH=${DEB_BUILD_ARCH} ; \
-	dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release \
+	dh_auto_configure -- \
 		-DSEQAN_STATIC_APPS=False -DSEQAN_NO_DOX=1 \
 		-DSEQAN_DISABLE_VERSION_CHECK=YES
 
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 149560c..187ec7a 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,5 +1,5 @@
 # We override parallel building on some archs
-seqan2 source: debian-rules-sets-DEB_BUILD_OPTIONS line 47
+seqan2 source: debian-rules-sets-DEB_BUILD_OPTIONS line 30
 
 # False positive, dh-exec is used by the docs package which is currently
 # disabled

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/seqan2.git