From: Richard Levitte <levitte@openssl.org>
Date: Thu, 14 Jan 2016 11:18:30 +0000 (+0100)
Subject: Fall back to c_rehash if 'openssl rehash' fails
X-Git-Tag: OpenSSL_1_1_0-pre2~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=67949615d25ead969c12e0f39370fef866df1704;p=oweals%2Fopenssl.git

Fall back to c_rehash if 'openssl rehash' fails

'openssl rehash' isn't implemented on all platforms, and since 'make
test' depends on a rehash of certs/demo being performed, it becomes an
effective block from running tests on any platform but Unix, for the
moment.

It's better to fall back to c_rehash and let the tests perform
everywhere.

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/Makefile.in b/Makefile.in
index cf575efc1d..af24a243f4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -426,13 +426,14 @@ dclean:
 	@set -e; target=dclean; $(RECURSIVE_BUILD_CMD)
 
 rehash: rehash.time
-rehash.time: certs apps
+rehash.time: certs build_apps
 	@if [ -z "$(CROSS_COMPILE)" ]; then \
 		(OPENSSL="`pwd`/util/opensslwrap.sh"; \
 		[ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe" || :; \
 		OPENSSL_DEBUG_MEMORY=on; OPENSSL_CONF=/dev/null ; \
 		export OPENSSL OPENSSL_DEBUG_MEMORY OPENSSL_CONF; \
-		$$OPENSSL rehash certs/demo) && \
+		$$OPENSSL rehash certs/demo \
+		|| $(PERL) tools/c_rehash certs/demo) && \
 		touch rehash.time; \
 	else :; fi