[src/netbsd-6]: src/usr.bin/config Pull up following revision(s) (requested b...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d42216778d98
branches:  netbsd-6
changeset: 774201:d42216778d98
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Jun 12 19:23:33 2012 +0000

description:
Pull up following revision(s) (requested by martin in ticket #318):
        usr.bin/config/defs.h: revision 1.44
        usr.bin/config/mkmakefile.c: revision 1.15
If we build several kernel (variants) within the same build directory, bad
things may happen in a parallel build - especially with rules like the
automatic size adjustment for SYMTAB_SPACE, see long standing failure of
evbarm on the build cluster.
Easy fix: .WAIT for each config to complete, before going on with the
next. Low impact, only minor loss of paralellism, and only in cases where
needed.

diffstat:

 usr.bin/config/defs.h       |  4 ++--
 usr.bin/config/mkmakefile.c |  9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 51f88f8f87fa -r d42216778d98 usr.bin/config/defs.h
--- a/usr.bin/config/defs.h     Tue Jun 12 19:20:37 2012 +0000
+++ b/usr.bin/config/defs.h     Tue Jun 12 19:23:33 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: defs.h,v 1.35 2010/04/30 20:47:18 pooka Exp $  */
+/*     $NetBSD: defs.h,v 1.35.8.1 2012/06/12 19:23:33 riz Exp $        */
 
 /*
  * Copyright (c) 1992, 1993
@@ -427,7 +427,7 @@
 
 TAILQ_HEAD(, devbase)  allbases;       /* list of all devbase structures */
 TAILQ_HEAD(, deva)     alldevas;       /* list of all devbase attachments */
-TAILQ_HEAD(, config)   allcf;          /* list of configured kernels */
+TAILQ_HEAD(conftq, config) allcf;      /* list of configured kernels */
 TAILQ_HEAD(, devi)     alldevi,        /* list of all instances */
                        allpseudo;      /* list of all pseudo-devices */
 TAILQ_HEAD(, devm)     alldevms;       /* list of all device-majors */
diff -r 51f88f8f87fa -r d42216778d98 usr.bin/config/mkmakefile.c
--- a/usr.bin/config/mkmakefile.c       Tue Jun 12 19:20:37 2012 +0000
+++ b/usr.bin/config/mkmakefile.c       Tue Jun 12 19:23:33 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkmakefile.c,v 1.13 2009/04/11 12:41:10 lukem Exp $    */
+/*     $NetBSD: mkmakefile.c,v 1.13.8.1 2012/06/12 19:23:34 riz Exp $  */
 
 /*
  * Copyright (c) 1992, 1993
@@ -512,6 +512,13 @@
        fputs(".MAIN: all\nall:", fp);
        TAILQ_FOREACH(cf, &allcf, cf_next) {
                fprintf(fp, " %s", cf->cf_name);
+               /*
+                * If we generate multiple configs inside the same build directory
+                * with a parallel build, strange things may happen, so sequentialize
+                * them.
+                */
+               if (cf != TAILQ_LAST(&allcf,conftq))
+                       fprintf(fp, " .WAIT");
        }
        fputs("\n\n", fp);
        TAILQ_FOREACH(cf, &allcf, cf_next) {