From owner-freebsd-stable@FreeBSD.ORG Tue Nov 12 16:04:24 2013 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 366AC5E6; Tue, 12 Nov 2013 16:04:24 +0000 (UTC) Received: from mail-ob0-x231.google.com (mail-ob0-x231.google.com [IPv6:2607:f8b0:4003:c01::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E35ED2797; Tue, 12 Nov 2013 16:04:23 +0000 (UTC) Received: by mail-ob0-f177.google.com with SMTP id wp4so4009285obc.8 for ; Tue, 12 Nov 2013 08:04:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=qnt9rzd5iIDWfgSgCUdNJQCRHTC468Xyrhec1HPgNf8=; b=lWK+AMBxp4GAptuyc/byP7eR9agHve1jDn6BW0/yZg1OvuMX+xHazSN5965HKyVPNH sagu7fpH4cr6+2QfA0leEvO8Q2DPxvFA9bqrNevD2RvHD+1ebUN0f4tZ9IjDrPM+EU+R w7Dr6PWePiKpE2L8x0rXiv5UU7OHrAEiEFAJzz59QBK6RvH90/so1lEb8vYYbd40IV8s 57ma0kCjtMIX6dfSxoGRd8bztv5/CU+rEOJB4IFI4tsyA2RUs28zZhv9yW0YyCp3lX+g 3LkrayHnrSeKONUrthJIsHVp2WL8+9MH6uC5zqj75tRhOaeozAd2YKvhEng8ixZbN8RZ 7/4Q== MIME-Version: 1.0 X-Received: by 10.60.40.136 with SMTP id x8mr12045766oek.49.1384272262992; Tue, 12 Nov 2013 08:04:22 -0800 (PST) Received: by 10.76.177.234 with HTTP; Tue, 12 Nov 2013 08:04:22 -0800 (PST) In-Reply-To: References: <20131107204218.GG89594@glenbarber.us> <1383860913.27740.44511277.4D9CF1BF@webmail.messagingengine.com> <20131107234832.GJ89594@glenbarber.us> <20131108165750.GS89594@glenbarber.us> Date: Tue, 12 Nov 2013 17:04:22 +0100 Message-ID: Subject: Re: Building 9.2-RELEASE on 10-stable From: Andreas Nilsson To: Glen Barber Content-Type: multipart/mixed; boundary=089e013cba50856ab004eafd00f3 X-Content-Filtered-By: Mailman/MimeDel 2.1.16 Cc: Mark Felder , "freebsd-stable@freebsd.org" X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Nov 2013 16:04:24 -0000 --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--