[v9_11] 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]

(cherry picked from commit a573b93b460ccbac1ea7bea12aa1911d587ade18)

diff --git a/CHANGES b/CHANGES
index 23a78169e9f681b3f0ddf5756bedca6f04bee155..12cd98f827af4320c773ff97823f352f55584992 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 75b309f22536bef9814840e6422b7a67c6d45797..136cbf0a4f229c9ae4ee3b8d4790c6d65bfb9aba 100644 (file)
--- a/bin/confgen/Makefile.in
+++ b/bin/confgen/Makefile.in
@@ -10,6 +10,10 @@ srcdir =     @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
 
+# Attempt to disable parallel processing.
+.NOTPARALLEL:
+.NO_PARALLEL:
+
 VERSION=@BIND9_VERSION@
 
 @BIND9_MAKE_INCLUDES@
@@ -66,11 +70,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 3a11bf5d101f5f22677b7344b1caa7084ec3e166..9fa12de9b62724a844c474069d8101a70e6dff37 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@
@@ -135,7 +139,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}