BIND 10 trac2962, updated. 35c53d9ab3422ba82ebd2c4f9afb73f1a5dc58dc [2962] Don't run b10-certgen in parallel (which results in corruption of PEM output files)

[BIND 10 source code commits]

The branch, trac2962 has been updated
       via  35c53d9ab3422ba82ebd2c4f9afb73f1a5dc58dc (commit)
      from  940eae0ca5d303a9420747a5c84358f91515075c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 35c53d9ab3422ba82ebd2c4f9afb73f1a5dc58dc
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu Aug 1 12:38:20 2013 +0530

    [2962] Don't run b10-certgen in parallel (which results in corruption of PEM output files)

-----------------------------------------------------------------------

Summary of changes:
 src/bin/cmdctl/Makefile.am |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/cmdctl/Makefile.am b/src/bin/cmdctl/Makefile.am
index 72a400a..25717d6 100644
--- a/src/bin/cmdctl/Makefile.am
+++ b/src/bin/cmdctl/Makefile.am
@@ -57,12 +57,19 @@ b10_certgen_CXXFLAGS = $(BOTAN_INCLUDES)
 b10_certgen_LDFLAGS = $(BOTAN_LIBS)
 
 # Generate the initial certificates immediately
-cmdctl-certfile.pem: b10-certgen
-	./b10-certgen -q -w
-
 cmdctl-keyfile.pem: b10-certgen
 	./b10-certgen -q -w
 
+# Do nothing. This is a hack, as b10-certgen creates both
+# cmdctl-keyfile.pem and cmdctl-certfile.pem, and in a parallel make,
+# making these targets simultaneously may result in corrupted
+# files. With GNU make, there is a non-portable way of working around
+# this with pattern rules, but we adopt this hack instead. The downside
+# is that cmdctl-certfile.pem will not be generated if
+# cmdctl-keyfile.pem exists. See Trac ticket #2962.
+cmdctl-certfile.pem: cmdctl-keyfile.pem
+	noop
+
 if INSTALL_CONFIGURATIONS
 
 # Below we intentionally use ${INSTALL} -m 640 instead of $(INSTALL_DATA)