Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/crypto/external Move openssl to the front of SUBDIR list and...



details:   https://anonhg.NetBSD.org/src/rev/36e48911b0cd
branches:  trunk
changeset: 753198:36e48911b0cd
user:      uwe <uwe%NetBSD.org@localhost>
date:      Sat Mar 20 02:07:33 2010 +0000

description:
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).

diffstat:

 crypto/external/bsd/Makefile |  4 ++--
 crypto/external/lib/Makefile |  5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r f105599e50bf -r 36e48911b0cd crypto/external/bsd/Makefile
--- a/crypto/external/bsd/Makefile      Sat Mar 20 01:52:16 2010 +0000
+++ b/crypto/external/bsd/Makefile      Sat Mar 20 02:07:33 2010 +0000
@@ -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>
diff -r f105599e50bf -r 36e48911b0cd crypto/external/lib/Makefile
--- a/crypto/external/lib/Makefile      Sat Mar 20 01:52:16 2010 +0000
+++ b/crypto/external/lib/Makefile      Sat Mar 20 02:07:33 2010 +0000
@@ -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>



Home | Main Index | Thread Index | Old Index