Module Name: src
Committed By: riz
Date: Tue Jun 12 19:23:34 UTC 2012
Modified Files:
src/usr.bin/config [netbsd-6]: defs.h mkmakefile.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.35.8.1 src/usr.bin/config/defs.h
cvs rdiff -u -r1.13 -r1.13.8.1 src/usr.bin/config/mkmakefile.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.35 src/usr.bin/config/defs.h:1.35.8.1
--- src/usr.bin/config/defs.h:1.35 Fri Apr 30 20:47:18 2010
+++ src/usr.bin/config/defs.h Tue Jun 12 19:23:33 2012
@@ -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 @@ struct hashtab *cdevmtab; /* character d
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 */
Index: src/usr.bin/config/mkmakefile.c
diff -u src/usr.bin/config/mkmakefile.c:1.13 src/usr.bin/config/mkmakefile.c:1.13.8.1
--- src/usr.bin/config/mkmakefile.c:1.13 Sat Apr 11 12:41:10 2009
+++ src/usr.bin/config/mkmakefile.c Tue Jun 12 19:23:34 2012
@@ -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 @@ emitload(FILE *fp)
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) {
