From e2e98a628d49430692cec7e1fc417250eb0e37e8 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Mon, 26 Jun 2017 10:00:42 +1000
Subject: [PATCH] 4641.   [cleanup]       Parallel builds (make -j) could fail
 with --with-atf /                         --enable-developer. [RT #45373]

(cherry picked from commit 1be7580be7081b6f4e099c70d6663d243c24911c)
---
 CHANGES          | 3 +++
 unit/Makefile.in | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/CHANGES b/CHANGES
index 54a70edfbf1..24f9b9a6fd3 100644
--- 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 f03cfce84f5..4b169b63a47 100644
--- 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
 
-- 
2.47.3