Date: Tue, 12 Nov 2013 17:04:22 +0100 From: Andreas Nilsson <andrnils@gmail.com> To: Glen Barber <gjb@freebsd.org> Cc: Mark Felder <feld@feld.me>, "freebsd-stable@freebsd.org" <freebsd-stable@freebsd.org> Subject: Re: Building 9.2-RELEASE on 10-stable Message-ID: <CAPS9%2BSs7SfNwO6GvfYMo%2BGw-LqP9BiBKmS=A8HQ4HOvFivPTGw@mail.gmail.com> In-Reply-To: <CAPS9%2BSvi8o4661yyiOStmb_kyW1VnmsD=T6Qx8pgrDX7Pv=x5g@mail.gmail.com> References: <CAPS9%2BStE=he6Lc1_=jUa-w5mOpysaqv9v7Rye=UWaRvU00ZOjg@mail.gmail.com> <20131107204218.GG89594@glenbarber.us> <1383860913.27740.44511277.4D9CF1BF@webmail.messagingengine.com> <20131107234832.GJ89594@glenbarber.us> <CE2ED655-1B7B-4D80-84FC-BF4DC551C252@feld.me> <CAPS9%2BSu9EguT2HNm-mUfE2J56vPm0yiH8VP_bCi4%2B83bjygxOA@mail.gmail.com> <20131108165750.GS89594@glenbarber.us> <CAPS9%2BSvi8o4661yyiOStmb_kyW1VnmsD=T6Qx8pgrDX7Pv=x5g@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--089e013cba50856ab004eafd00f3
Content-Type: text/plain; charset=ISO-8859-1
Sorry for previous noise, I was tired...
The below two patches both seems to solve the "A failure has been detected
in another branch of the parallel make". Which one is preferred?
Index: tools/build/make_check/Makefile
===================================================================
--- tools/build/make_check/Makefile (revision 258038)
+++ tools/build/make_check/Makefile (working copy)
@@ -1,7 +1,7 @@
# $FreeBSD$
.MAKE.MODE= normal
-
+.NOTPARALLEL
# Test for broken LHS expansion.
# This *must* cause make(1) to detect a recursive variable, and fail as
such.
.if make(lhs_expn)
and
Index: Makefile
===================================================================
--- Makefile (revision 258038)
+++ Makefile (working copy)
@@ -288,7 +288,7 @@
upgrade_checks:
@if ! (cd ${.CURDIR}/tools/build/make_check && \
PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
- PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
+ PATH=${PATH} ${BINMAKE} ${MAKEFLAGS:N-j*} >/dev/null 2>&1); \
then \
(cd ${.CURDIR} && ${MAKE} make); \
fi
Best regards
Andreas
--089e013cba50856ab004eafd00f3
Content-Type: text/plain; charset=US-ASCII; name="makecheck.diff"
Content-Disposition: attachment; filename="makecheck.diff"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_hnxbx6q30
SW5kZXg6IHRvb2xzL2J1aWxkL21ha2VfY2hlY2svTWFrZWZpbGUKPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gdG9v
bHMvYnVpbGQvbWFrZV9jaGVjay9NYWtlZmlsZQkocmV2aXNpb24gMjU4MDM4KQorKysgdG9vbHMv
YnVpbGQvbWFrZV9jaGVjay9NYWtlZmlsZQkod29ya2luZyBjb3B5KQpAQCAtMSw3ICsxLDcgQEAK
ICMgJEZyZWVCU0QkCiAKIC5NQUtFLk1PREU9CW5vcm1hbAotCisuTk9UUEFSQUxMRUwKICMgVGVz
dCBmb3IgYnJva2VuIExIUyBleHBhbnNpb24uCiAjIFRoaXMgKm11c3QqIGNhdXNlIG1ha2UoMSkg
dG8gZGV0ZWN0IGEgcmVjdXJzaXZlIHZhcmlhYmxlLCBhbmQgZmFpbCBhcyBzdWNoLgogLmlmIG1h
a2UobGhzX2V4cG4pCg==
--089e013cba50856ab004eafd00f3
Content-Type: text/plain; charset=US-ASCII; name="Makefile-fix-upgrade_checks.diff"
Content-Disposition: attachment; filename="Makefile-fix-upgrade_checks.diff"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_hnxbx6qi1
SW5kZXg6IE1ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIE1ha2VmaWxlCShyZXZpc2lvbiAyNTgwMzgp
CisrKyBNYWtlZmlsZQkod29ya2luZyBjb3B5KQpAQCAtMjg4LDcgKzI4OCw3IEBACiB1cGdyYWRl
X2NoZWNrczoKIAlAaWYgISAoY2QgJHsuQ1VSRElSfS90b29scy9idWlsZC9tYWtlX2NoZWNrICYm
IFwKIAkgICAgUEFUSD0ke1BBVEh9ICR7QklOTUFLRX0gb2JqID4vZGV2L251bGwgMj4mMSAmJiBc
Ci0JICAgIFBBVEg9JHtQQVRIfSAke0JJTk1BS0V9ID4vZGV2L251bGwgMj4mMSk7IFwKKwkgICAg
UEFUSD0ke1BBVEh9ICR7QklOTUFLRX0gJHtNQUtFRkxBR1M6Ti1qKn0gPi9kZXYvbnVsbCAyPiYx
KTsgXAogCXRoZW4gXAogCSAgICAoY2QgJHsuQ1VSRElSfSAmJiAke01BS0V9IG1ha2UpOyBcCiAJ
ZmkK
--089e013cba50856ab004eafd00f3--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPS9%2BSs7SfNwO6GvfYMo%2BGw-LqP9BiBKmS=A8HQ4HOvFivPTGw>