[med-svn] [seqan2] 01/01: Backport debian/rules from experimental

[Michael Crusoe]

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

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

commit 50d0647dd20d8e516a33258a5e65b02ca31b32a7
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Tue Oct 24 00:31:47 2017 -0700

    Backport debian/rules from experimental
---
 debian/changelog                |  8 ++++++++
 debian/rules                    | 27 ++++++++++++++-------------
 debian/source/lintian-overrides |  8 +++++++-
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f8dac25..8bc6897 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+seqan2 (2.3.2+dfsg2-3) unstable; urgency=medium
+
+  * Patch for mips64el from bunk at debian.org (Closes: #878933)
+  * Cleaned up per-arch settings in debian/rules
+  * Disable parallel building on sh4
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Tue, 24 Oct 2017 04:56:12 -0700
+
 seqan2 (2.3.2+dfsg2-2) unstable; urgency=medium
 
   * As per upstream, disable async-io for many platforms
diff --git a/debian/rules b/debian/rules
index 920eab1..6b6b09e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,6 @@ export HOME=$(shell echo $$PWD"/fakehome")
 # See https://wiki.debian.org/Hardening#Notes_for_packages_using_CMake
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
-CFLAGS+=$(CPPFLAGS) -O3
-CXXFLAGS+=$(CPPFLAGS) -O3
 
 # 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
@@ -22,26 +20,29 @@ CXXFLAGS+=$(CPPFLAGS) -O3
 DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 DEB_BUILD_ARCH          ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-ifneq (,$(filter mips mipsel,$(DEB_BUILD_ARCH)))
-    export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS | sed 's/-O[1-9]//') -O1 -mxgot
+ifneq (,$(filter mips mipsel kfreebsd% hurd%,$(DEB_BUILD_ARCH)))
+    CXXFLAGS+=-O1
+    CFLAGS+=-01
+else
+    CXXFLAGS+=-O3
+    CFLAGS+=-O3
+endif
+
+ifneq (,$(filter mips mipsel mips64el,$(DEB_BUILD_ARCH)))
+    export CXXFLAGS+=-mxgot
 endif
 # Disable parallel building on some build archs to save memory
-ifneq (,$(filter armhf mips kfreebsd%,$(DEB_BUILD_ARCH)))
+ifneq (,$(filter armhf mips kfreebsd% sh4,$(DEB_BUILD_ARCH)))
     $(info $$DEB_BUILD_OPTIONS was [${DEB_BUILD_OPTIONS}])
     TDBO := $(DEB_BUILD_OPTIONS)
     export DEB_BUILD_OPTIONS=parallel=1,$(filter $(TDBO), parallel)
 endif
 $(info $$DEB_BUILD_OPTIONS is [${DEB_BUILD_OPTIONS}])
 
-# Try to save memory on kfreebsd-* and hurd-i386
-ifneq (,$(filter kfreebsd% hurd%,$(DEB_BUILD_ARCH)))
-	export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS | sed 's/-O[1-9]//') -O1
-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
-NOASYNC=-DCMAKE_CXX_FLAGS="-DSEQAN_ASYNC_IO=0"
+CXXFLAGS+="-DSEQAN_ASYNC_IO=0"
 endif
 
 pkgapps=seqan-apps
@@ -54,13 +55,13 @@ override_dh_auto_configure-arch:
 	#	dh_auto_configure -- -DSEQAN_BUILD_SYSTEM=SEQAN_RELEASE_APPS -DSEQAN_STATIC_APPS=False  # skip the tests for now
 	dh_auto_configure -- -DSEQAN_BUILD_SYSTEM=DEVELOP \
 		-DSEQAN_STATIC_APPS=False -DSEQAN_NO_DOX=1 \
-		-DSEQAN_DISABLE_VERSION_CHECK=YES $(NOASYNC)
+		-DSEQAN_DISABLE_VERSION_CHECK=YES
 
 override_dh_auto_configure-indep: ;
 
 override_dh_auto_build-arch:
 	dh_auto_build --arch
-	#cd obj-$(DEB_BUILD_GNU_TYPE); make dox # FIXME: This does nothing and no *.html files will be created at all
+	#cd obj-$(DEB_BUILD_GNU_TYPE); make dox # This does nothing and no *.html files will be created at all
 	# This ends up in:
 	# Could not import extension sphinxcontrib.bibtex (exception: No module named sphinxcontrib.bibtex)
 	# Seems there is no sphinx module bibtex - thus deactivating creation of html manual
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index c493f4b..1f2874a 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1 +1,7 @@
-seqan2 source: debian-rules-sets-DEB_BUILD_OPTIONS line 32
+# We extract and replace parallel on some archs
+seqan2 source: debian-rules-sets-DEB_BUILD_OPTIONS line 38
+
+# False positive, there are files in the debian/ directory that reference
+# dh-exec but they aren't currently used to build any packages as doc package
+# and its builddeps are disabled for now
+seqan2 source: package-uses-dh-exec-but-lacks-build-depends

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