Date: Wed, 12 Aug 2015 20:40:44 +0000 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) Message-ID: <bug-202277-8@https.bugs.freebsd.org/bugzilla/>
next in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-202277-8>