From owner-freebsd-bugs@freebsd.org Wed Aug 12 20:40:44 2015 Return-Path: Delivered-To: freebsd-bugs@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F9DB9ABC36 for ; Wed, 12 Aug 2015 20:40:44 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 79C13616 for ; Wed, 12 Aug 2015 20:40:44 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id t7CKeif6010147 for ; Wed, 12 Aug 2015 20:40:44 GMT (envelope-from bugzilla-noreply@freebsd.org) From: bugzilla-noreply@freebsd.org To: freebsd-bugs@FreeBSD.org Subject: [Bug 202277] [patch] src/Makefile.inc1 - fix buildworld from 9.3-stable to 10.2-stable (Malformed conditional after r285814) Date: Wed, 12 Aug 2015 20:40:44 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: new X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Base System X-Bugzilla-Component: misc X-Bugzilla-Version: 10.2-STABLE X-Bugzilla-Keywords: patch X-Bugzilla-Severity: Affects Some People X-Bugzilla-Who: z7dr6ut7gs@snkmail.com X-Bugzilla-Status: New X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: freebsd-bugs@FreeBSD.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: bug_id short_desc product version rep_platform op_sys bug_status keywords bug_severity priority component assigned_to reporter attachments.created Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Aug 2015 20:40:44 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=202277 Bug ID: 202277 Summary: [patch] src/Makefile.inc1 - fix buildworld from 9.3-stable to 10.2-stable (Malformed conditional after r285814) Product: Base System Version: 10.2-STABLE Hardware: Any OS: Any Status: New Keywords: patch Severity: Affects Some People Priority: --- Component: misc Assignee: freebsd-bugs@FreeBSD.org Reporter: z7dr6ut7gs@snkmail.com Keywords: patch Created attachment 159819 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=159819&action=edit use ${MAKE} in Makefile.inc1 for setting REVISION & BRANCH When updating from 9.3-stable to 10.2-stable, you get: make buildworld . . "/usr/src/release/Makefile.vagrant", line 27: Malformed conditional () "/usr/src/release/Makefile.vagrant", line 27: Malformed conditional () "/usr/src/release/Makefile.vagrant", line 29: if-less endif "/usr/src/release/Makefile.vagrant", line 27: Malformed conditional () "/usr/src/release/Makefile.vagrant", line 29: if-less endif "/usr/src/release/Makefile.vagrant", line 27: Malformed conditional () "/usr/src/release/Makefile.vagrant", line 29: if-less endif "/usr/src/release/Makefile.vagrant", line 31: if-less endif "/usr/src/release/Makefile.vagrant", line 64: Malformed conditional (azure == "virtualbox") "/usr/src/release/Makefile.vagrant", line 67: if-less elif "/usr/src/release/Makefile.vagrant", line 70: if-less endif "/usr/src/release/Makefile.vagrant", line 74: Malformed conditional (azure == "virtualbox") "/usr/src/release/Makefile.vagrant", line 76: if-less elif "/usr/src/release/Makefile.vagrant", line 78: if-less endif "/usr/src/release/Makefile.vagrant", line 64: Malformed conditional (ec2 == "virtualbox") "/usr/src/release/Makefile.vagrant", line 67: if-less elif . . This is caused by these lines from Makefile.inc1 (at least r286673 and earlier): REVISION!= make -C ${SRCDIR}/release -V REVISION BRANCH!= make -C ${SRCDIR}/release -V BRANCH This uses fmake (9.3-stable's /usr/bin/make) and release/Makefile.vagrant (included by release/Makefile.vm which is included by release/Makefile) has some bmake-isms in it (as of July 23's r285814 on 10-stable). Makefile.vagrant could be scrubbed of bmake-isms, but it's just as easy and probably better to use ${MAKE} instead of 'make' in Makefile.inc1. The patch I'll attach uses that approach (can commit to HEAD and MFC to 10-stable). -- You are receiving this mail because: You are the assignee for the bug.