From owner-svn-src-all@FreeBSD.ORG Sat Mar 15 23:51:29 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 47660EA0; Sat, 15 Mar 2014 23:51:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 18FE72F9; Sat, 15 Mar 2014 23:51:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2FNpSu8048894; Sat, 15 Mar 2014 23:51:28 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2FNpSMN048890; Sat, 15 Mar 2014 23:51:28 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201403152351.s2FNpSMN048890@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 15 Mar 2014 23:51:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r263212 - in stable/9: share/mk usr.bin usr.bin/bmake X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Mar 2014 23:51:29 -0000 Author: sjg Date: Sat Mar 15 23:51:28 2014 New Revision: 263212 URL: http://svnweb.freebsd.org/changeset/base/263212 Log: Backport bmake to 9 so ports can rely on it being available. We only build/install it as bmake. Requested by: bapt Reviewed by: marcel Added: - copied from r263096, stable/10/contrib/bmake/ - copied from r263096, stable/10/usr.bin/bmake/ Directory Properties: stable/9/contrib/bmake/ (props changed) stable/9/usr.bin/bmake/ (props changed) Modified: stable/9/share/mk/sys.mk stable/9/usr.bin/Makefile stable/9/usr.bin/bmake/Makefile.inc Directory Properties: stable/9/share/mk/ (props changed) Modified: stable/9/share/mk/sys.mk ============================================================================== --- stable/9/share/mk/sys.mk Sat Mar 15 23:09:34 2014 (r263211) +++ stable/9/share/mk/sys.mk Sat Mar 15 23:51:28 2014 (r263212) @@ -326,12 +326,6 @@ SHELL= ${__MAKE_SHELL} # XXX hint for bsd.port.mk OBJFORMAT?= elf -# Tell bmake to expand -V VAR by default -.MAKE.EXPAND_VARIABLES= yes - -# Tell bmake the makefile preference -.MAKE.MAKEFILE_PREFERENCE= BSDmakefile makefile Makefile - .if !defined(.PARSEDIR) # We are not bmake, which is more aggressive about searching .PATH # It is sometime necessary to curb its enthusiasm with .NOPATH @@ -345,5 +339,25 @@ OBJFORMAT?= elf .endif +.if defined(.PARSEDIR) +# Tell bmake to expand -V VAR by default +.MAKE.EXPAND_VARIABLES= yes + +# Tell bmake the makefile preference +.MAKE.MAKEFILE_PREFERENCE= BSDmakefile makefile Makefile + +# By default bmake does *not* use set -e +# when running target scripts, this is a problem for many makefiles here. +# So define a shell that will do what FreeBSD expects. +.ifndef WITHOUT_SHELL_ERRCTL +.SHELL: name=sh \ + quiet="set -" echo="set -v" filter="set -" \ + hasErrCtl=yes check="set -e" ignore="set +e" \ + echoFlag=v errFlag=e \ + path=${__MAKE_SHELL:U/bin/sh} +.endif + +.endif + .include .include Modified: stable/9/usr.bin/Makefile ============================================================================== --- stable/9/usr.bin/Makefile Sat Mar 15 23:09:34 2014 (r263211) +++ stable/9/usr.bin/Makefile Sat Mar 15 23:51:28 2014 (r263212) @@ -273,6 +273,7 @@ SUBDIR+= msgs .endif .if ${MK_MAKE} != "no" +SUBDIR+= bmake SUBDIR+= make .endif Modified: stable/9/usr.bin/bmake/Makefile.inc ============================================================================== --- stable/10/usr.bin/bmake/Makefile.inc Wed Mar 12 17:18:15 2014 (r263096) +++ stable/9/usr.bin/bmake/Makefile.inc Sat Mar 15 23:51:28 2014 (r263212) @@ -13,10 +13,6 @@ MK_BMAKE= yes .endif -.if defined(MK_BMAKE) && ${MK_BMAKE} != "no" -PROG= make -.endif - .if !defined(MK_SHARED_TOOLCHAIN) || ${MK_SHARED_TOOLCHAIN} == "no" NO_SHARED?= YES .endif