[Pkg-swan-devel] [strongswan] 01/02: export TESTS_REDUCED_KEYLENGTHS for non linux/x86 arches

[Yves-Alexis Perez]

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

corsac pushed a commit to branch master
in repository strongswan.

commit 2f825efc95b280c748a46d3fd11a0facb77f1131
Author: Yves-Alexis Perez <corsac at debian.org>
Date:   Tue Mar 25 12:09:47 2014 +0100

    export TESTS_REDUCED_KEYLENGTHS for non linux/x86 arches
    
    * debian/rules:
      - use reduced keylengths in testsuite on various arches, hopefully fixing
        FTBFS when the genrsa test runs.
---
 debian/changelog |  8 ++++++++
 debian/rules     | 14 +++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 803fc9e..9ea7a0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+strongswan (5.1.2-2) UNRELEASED; urgency=medium
+
+  * debian/rules:
+    - use reduced keylengths in testsuite on various arches, hopefully fixing
+      FTBFS when the genrsa test runs.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 25 Mar 2014 11:56:11 +0100
+
 strongswan (5.1.2-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index cc42d93..51ab054 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,9 +30,21 @@ CONFIGUREARGS := --libdir=/usr/lib --libexecdir=/usr/lib \
 	# (most notably the Phion one) have problems connecting when pluto 
 	# sends these Cisco options.
 
+# get the various DEB_BUILD/DEB_HOST variables
+include /usr/share/dpkg/architecture.mk
+
+# use reduced keylength in testsuite for !linux and !x86
+ifneq ($(DEB_BUILD_ARCH_OS),linux)
+	export TESTS_REDUCED_KEYLENGTHS=true
+endif
+ifneq ($(DEB_BUILD_ARCH_CPU),i386)
+ifneq ($(DEB_BUILD_ARCH_CPU),amd64)
+	export TESTS_REDUCED_KEYLENGTHS=true
+endif
+endif
+
 # the padlock plugin only makes sense on i386 
 # RdRand only makes sense on i386 and amd64
-DEB_BUILD_ARCH_CPU ?=$(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
 ifeq ($(DEB_BUILD_ARCH_CPU),i386)
   CONFIGUREARGS += --enable-padlock --enable-rdrand
 endif

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