Module Name: src
Committed By: uwe
Date: Sat Mar 20 02:07:33 UTC 2010
Modified Files:
src/crypto/external/bsd: Makefile
src/crypto/external/lib: Makefile
Log Message:
Move openssl to the front of SUBDIR list and add .WAIT after it since
both netpgp and openssh depend on it. This should fix intermittent
failures of parallel builds (as seen e.g. on the autobuild cluster).
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/Makefile
diff -u src/crypto/external/bsd/Makefile:1.7 src/crypto/external/bsd/Makefile:1.8
--- src/crypto/external/bsd/Makefile:1.7 Sun Jul 19 23:43:46 2009
+++ src/crypto/external/bsd/Makefile Sat Mar 20 02:07:33 2010
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2009/07/19 23:43:46 christos Exp $
+# $NetBSD: Makefile,v 1.8 2010/03/20 02:07:33 uwe Exp $
.include <bsd.own.mk>
.if (${MKCRYPTO} != "no")
-SUBDIR+= netpgp openssh openssl
+SUBDIR+= openssl .WAIT netpgp openssh
.endif
.include <bsd.subdir.mk>
Index: src/crypto/external/lib/Makefile
diff -u src/crypto/external/lib/Makefile:1.5 src/crypto/external/lib/Makefile:1.6
--- src/crypto/external/lib/Makefile:1.5 Sun Jul 19 23:44:20 2009
+++ src/crypto/external/lib/Makefile Sat Mar 20 02:07:33 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/07/19 23:44:20 christos Exp $
+# $NetBSD: Makefile,v 1.6 2010/03/20 02:07:33 uwe Exp $
#
# This Makefile exists to provide a single point to build
@@ -9,9 +9,10 @@
.include <bsd.own.mk>
.if (${MKCRYPTO} != "no")
+SUBDIR+= ../bsd/openssl/lib
+SUBDIR+= .WAIT
SUBDIR+= ../bsd/netpgp/lib
SUBDIR+= ../bsd/openssh/lib
-SUBDIR+= ../bsd/openssl/lib
.endif
.include <bsd.subdir.mk>
