From 2ff643e1f626006755aba20d9a3134a68c3167cc Mon Sep 17 00:00:00 2001 From: uwe Date: Sat, 20 Mar 2010 02:07:33 +0000 Subject: [PATCH] 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). --- crypto/external/bsd/Makefile | 4 ++-- crypto/external/lib/Makefile | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/crypto/external/bsd/Makefile b/crypto/external/bsd/Makefile index e78db4476e95..0b3233eb88d2 100644 --- a/crypto/external/bsd/Makefile +++ b/crypto/external/bsd/Makefile @@ -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 .if (${MKCRYPTO} != "no") -SUBDIR+= netpgp openssh openssl +SUBDIR+= openssl .WAIT netpgp openssh .endif .include diff --git a/crypto/external/lib/Makefile b/crypto/external/lib/Makefile index 6b5c49343d2e..8aa237ccb247 100644 --- a/crypto/external/lib/Makefile +++ b/crypto/external/lib/Makefile @@ -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 .if (${MKCRYPTO} != "no") +SUBDIR+= ../bsd/openssl/lib +SUBDIR+= .WAIT SUBDIR+= ../bsd/netpgp/lib SUBDIR+= ../bsd/openssh/lib -SUBDIR+= ../bsd/openssl/lib .endif .include