[Pkg-openssl-changes] r608 - openssl/trunk/debian

[Kurt Roeckx]

Author: kroeckx
Date: 2013-11-01 15:17:54 +0000 (Fri, 01 Nov 2013)
New Revision: 608

Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/rules
Log:
Add support for nocheck in DEB_BUILD_OPTIONS


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2013-11-01 14:14:56 UTC (rev 607)
+++ openssl/trunk/debian/changelog	2013-11-01 15:17:54 UTC (rev 608)
@@ -7,8 +7,9 @@
   [ Kurt Roeckx ]
   * Add mipsn32 and mips64 targets.  Patch from Eleanor Chen
     <chenyueg at gmail.com>  (Closes: #720654)
+  * Add support for nocheck in DEB_BUILD_OPTIONS
 
- -- Kurt Roeckx <kurt at roeckx.be>  Fri, 01 Nov 2013 15:13:35 +0100
+ -- Kurt Roeckx <kurt at roeckx.be>  Fri, 01 Nov 2013 16:17:19 +0100
 
 openssl (1.0.1e-3) unstable; urgency=low
 

Modified: openssl/trunk/debian/rules
===================================================================
--- openssl/trunk/debian/rules	2013-11-01 14:14:56 UTC (rev 607)
+++ openssl/trunk/debian/rules	2013-11-01 15:17:54 UTC (rev 608)
@@ -31,6 +31,11 @@
 	CONFARGS += enable-ec_nistp_64_gcc_128
 endif
 
+MAKE_TEST = make test
+ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	MAKE_TEST = :
+endif
+
 build: build-arch build-indep
 build-arch: build-stamp
 build-indep: build-stamp
@@ -40,7 +45,7 @@
 #	chmod +x debian/libtool
 	./Configure no-shared $(CONFARGS) debian-$(DEB_HOST_ARCH)
 	make -f Makefile all
-	make test
+	$(MAKE_TEST)
 	mv libcrypto.a libcrypto.static
 	mv libssl.a libssl.static
 	make -f Makefile clean
@@ -49,7 +54,7 @@
 		set -xe; \
 		./Configure shared $(CONFARGS) debian-$(DEB_HOST_ARCH)-$$opt; \
 		make -f Makefile all; \
-		make test; \
+		$(MAKE_TEST); \
 		mkdir -p $$opt; \
 		mv libcrypto.so* libssl.so* $$opt/; \
 		make -f Makefile clean; \
@@ -59,7 +64,7 @@
 	ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
 #	make -f Makefile linux-shared
 	make -f Makefile all
-	make test
+	$(MAKE_TEST)
 #	strip apps/openssl
 #	make -f Makefile clean
 #	./Configure --prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 debian-$(DEB_HOST_ARCH)