[Pkg-gnupg-commit] [gnupg2] 15/16: Fix FTBFS on hppa (Closes: #887843)

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository gnupg2.

commit c27c5411a794e1e03216c5f5ecd6a08f86765b31
Author: Helge Deller <deller at gmx.de>
Date:   Mon Feb 5 22:51:23 2018 -0500

    Fix FTBFS on hppa (Closes: #887843)
    
    gnupg2 sometimes randomly fails to build from source on hppa.
    
    The reason is, that the tests are started in parallel, which then
    generates a system load of ~ 40 on the 4-way hppa machine (probably
    due to slow atomic operations and slow fork() implementations). That
    then makes that the waiting in the tests often times out and thus
    breaks the build.
    
    This patch disables the parallel tests on hppa and thus fixes the
    problem.
    
    While at it, the patch re-enables "-pie" again on hppa, now since
    "-pie" works on hppa.
---
 debian/rules | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 026b314..69be279 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,14 +14,23 @@ include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-# avoid -pie for gpgv-static on hppa, kfreebsd-amd64, and x32
+# avoid -pie for gpgv-static on kfreebsd-amd64, and x32
 # platforms, which cannot support it by default:
-ifeq (,$(filter $(DEB_HOST_ARCH), hppa kfreebsd-amd64 x32))
+ifeq (,$(filter $(DEB_HOST_ARCH), kfreebsd-amd64 x32))
 GPGV_STATIC_HARDENING = "-pie"
 else
 GPGV_STATIC_HARDENING = ""
 endif
 
+# Avoid parallel tests on hppa architecture.
+# Parallel tests generates high load on machine which causes timeouts and thus
+# triggers unexpected failures.
+ifeq (,$(filter $(DEB_HOST_ARCH), hppa))
+AUTOTEST_FLAGS = "--parallel"
+else
+AUTOTEST_FLAGS = "--no-parallel"
+endif
+
 %:
 	dh $@ --with=autoreconf --builddirectory=build
 
@@ -68,7 +77,7 @@ override_dh_auto_build-indep:
 
 
 override_dh_auto_test:
-	dh_auto_test --builddirectory=build -- verbose=3 TESTFLAGS=--parallel
+	dh_auto_test --builddirectory=build -- verbose=3 TESTFLAGS=$(AUTOTEST_FLAGS)
 
 override_dh_shlibdeps:
 # Make ldap a recommends rather than a hard dependency.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git