From owner-svn-src-all@freebsd.org Tue Feb 6 19:25:15 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0B183EF5494; Tue, 6 Feb 2018 19:25:15 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0EC7A7BD2D; Tue, 6 Feb 2018 19:25:13 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id w16JP4n1017962; Tue, 6 Feb 2018 11:25:04 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id w16JP4aq017961; Tue, 6 Feb 2018 11:25:04 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201802061925.w16JP4aq017961@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r328934 - in head: . bin/sh In-Reply-To: <201802061541.w16FfadO041469@repo.freebsd.org> To: Alex Richardson Date: Tue, 6 Feb 2018 11:25:04 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 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: Tue, 06 Feb 2018 19:25:15 -0000 > Author: arichardson > Date: Tue Feb 6 15:41:35 2018 > New Revision: 328934 > URL: https://svnweb.freebsd.org/changeset/base/328934 > > Log: > Don't hardcode /usr/bin as the path for mktemp in build tools > > It won't work e.g. when crossbuilding from Ubuntu Linux as mktemp is in > /bin there. > > Reviewed By: bdrewery > Approved By: jhb (mentor) > Differential Revision: https://reviews.freebsd.org/D13937 Would it be better to create the variable MKTEMP to point at either /bin/mktemp or /usr/bin/mktemp dependent on platform, there are reasons we use full paths in Makefiles, mostly to stop /usr/local/bin/foo contimaton, which I believe this change now opens up, though very slight as I dont know of a third party mktemp binary. > Modified: > head/Makefile.inc1 > head/bin/sh/mkbuiltins > head/bin/sh/mktokens > > Modified: head/Makefile.inc1 > ============================================================================== > --- head/Makefile.inc1 Tue Feb 6 15:41:26 2018 (r328933) > +++ head/Makefile.inc1 Tue Feb 6 15:41:35 2018 (r328934) > @@ -463,7 +463,7 @@ TMPPATH= ${STRICTTMPPATH}:${PATH} > # when in the middle of installing over this system. > # > .if make(distributeworld) || make(installworld) || make(stageworld) > -INSTALLTMP!= /usr/bin/mktemp -d -u -t install > +INSTALLTMP!= mktemp -d -u -t install > .endif > > .if make(stagekernel) || make(distributekernel) > > Modified: head/bin/sh/mkbuiltins > ============================================================================== > --- head/bin/sh/mkbuiltins Tue Feb 6 15:41:26 2018 (r328933) > +++ head/bin/sh/mkbuiltins Tue Feb 6 15:41:35 2018 (r328934) > @@ -34,7 +34,7 @@ > # @(#)mkbuiltins 8.2 (Berkeley) 5/4/95 > # $FreeBSD$ > > -temp=`/usr/bin/mktemp -t ka` > +temp=`mktemp -t ka` > havehist=1 > if [ "X$1" = "X-h" ]; then > havehist=0 > > Modified: head/bin/sh/mktokens > ============================================================================== > --- head/bin/sh/mktokens Tue Feb 6 15:41:26 2018 (r328933) > +++ head/bin/sh/mktokens Tue Feb 6 15:41:35 2018 (r328934) > @@ -38,7 +38,7 @@ > # token marks the end of a list. The third column is the name to print in > # error messages. > > -temp=`/usr/bin/mktemp -t ka` > +temp=`mktemp -t ka` > cat > $temp <<\! > TEOF 1 end of file > TNL 0 newline > > -- Rod Grimes rgrimes@freebsd.org