[master] Disable parallel make inside bin/confgen/ and bin/named/

4826.	[cleanup]	Prevent potential build failures in bin/confgen/ and
			bin/named/ when using parallel make. [RT #46648]

diff --git a/CHANGES b/CHANGES
index 53c80680702a2aaa6ca73cd646d38b5bddebed76..e21084ee9f83aa2460f18d85b202b72795323b8e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4826.  [cleanup]       Prevent potential build failures in bin/confgen/ and
+                       bin/named/ when using parallel make. [RT #46648]
+
 4825.  [bug]           Prevent a bogus "error during managed-keys processing
                        (no more)" warning from being logged. [RT #46645]
 

diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
index 1f336b3381cdb97d74ed1bc87fd32d91ea9aafb9..a0a19f51396dbafb8aa18305daf46e599ce127ea 100644 (file)
--- a/bin/confgen/Makefile.in
+++ b/bin/confgen/Makefile.in
@@ -8,6 +8,10 @@ srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
 
+# Attempt to disable parallel processing.
+.NOTPARALLEL:
+.NO_PARALLEL:
+
 VERSION=@BIND9_VERSION@
 
 @BIND9_MAKE_INCLUDES@
@@ -64,11 +68,11 @@ rndc-confgen.@O@: rndc-confgen.c
 ddns-confgen.@O@: ddns-confgen.c
        ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c ${srcdir}/ddns-confgen.c
 
-rndc-confgen@EXEEXT@: rndc-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS} ${CONFDEPLIBS}
+rndc-confgen@EXEEXT@: rndc-confgen.@O@ util.@O@ keygen.@O@ ${CONFDEPLIBS}
        export BASEOBJS="rndc-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS}"; \
        ${FINALBUILDCMD}
 
-ddns-confgen@EXEEXT@: ddns-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS} ${CONFDEPLIBS}
+ddns-confgen@EXEEXT@: ddns-confgen.@O@ util.@O@ keygen.@O@ ${CONFDEPLIBS}
        export BASEOBJS="ddns-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS}"; \
        ${FINALBUILDCMD}
 

diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index 7ddc621fd0eec3b64cb29ea607090b1523b8f701..d2979d7bb82669ec82a4bcc29375970aefb93f6b 100644 (file)
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -8,6 +8,10 @@ srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
 
+# Attempt to disable parallel processing.
+.NOTPARALLEL:
+.NO_PARALLEL:
+
 VERSION=@BIND9_VERSION@
 
 @BIND9_PRODUCT@
@@ -130,7 +134,7 @@ server.@O@: server.c
                -DPRODUCT=\"${PRODUCT}\" \
                -DVERSION=\"${VERSION}\" -c ${srcdir}/server.c
 
-named@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
+named@EXEEXT@: ${OBJS} ${DEPLIBS}
        export MAKE_SYMTABLE="yes"; \
        export BASEOBJS="${OBJS} ${UOBJS}"; \
        ${FINALBUILDCMD}