4641. [cleanup] Parallel builds (make -j) could fail with --with-atf /

                        --enable-developer. [RT #45373]

(cherry picked from commit 1be7580be7081b6f4e099c70d6663d243c24911c)

diff --git a/CHANGES b/CHANGES
index 54a70edfbf14c23536babe802a673c8b5ac4ed7f..24f9b9a6fd3c77dcff5e60330643ae75372c1956 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4641.  [cleanup]       Parallel builds (make -j) could fail with --with-atf /
+                       --enable-developer. [RT #45373]
+
 4640.  [bug]           If query_findversion failed in query_getdb due to
                        memory failure the error status was incorrectly
                        discarded. [RT #45331]

diff --git a/unit/Makefile.in b/unit/Makefile.in
index f03cfce84f52e65f3de81e024f915cd08ddd8396..4b169b63a47cf56fb636575c52e9ba21c380c1aa 100644 (file)
--- a/unit/Makefile.in
+++ b/unit/Makefile.in
@@ -18,6 +18,9 @@ srcdir =      @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
 
+# Attempt to disable parallel processing.
+.NOTPARALLEL:
+.NO_PARALLEL:
 SUBDIRS =      @ATFBUILD@
 TARGETS =       atf