Date: Thu, 4 Jan 2018 20:06:48 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458059 - branches/2018Q1/Mk Message-ID: <201801042006.w04K6mXj049641@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Jan 4 20:06:48 2018 New Revision: 458059 URL: https://svnweb.freebsd.org/changeset/ports/458059 Log: MFH: r458058 Follow-up r458048: Properly trim FLAVOR from .MAKEOVERRIDES. The code I removed was wrong but it still achieved the proper effect of removing FLAVOR from .MAKEOVERRIDES. This is still needed and now is done properly without truncating away all of the other valuable variables. Pointyhat to: bdrewery Approved by: portmgr (implicit) Modified: branches/2018Q1/Mk/bsd.port.mk Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/Mk/bsd.port.mk ============================================================================== --- branches/2018Q1/Mk/bsd.port.mk Thu Jan 4 20:06:21 2018 (r458058) +++ branches/2018Q1/Mk/bsd.port.mk Thu Jan 4 20:06:48 2018 (r458059) @@ -1081,6 +1081,9 @@ _PORTS_DIRECTORIES+= ${PKG_DBDIR} ${PREFIX} ${WRKDIR} .include "${PORTSDIR}/Mk/bsd.commands.mk" +# Do not leak flavors to childs make +.MAKEOVERRIDES:= ${.MAKEOVERRIDES:NFLAVOR} + .if !empty(FLAVOR) && !defined(_DID_FLAVORS_HELPERS) _DID_FLAVORS_HELPERS= yes _FLAVOR_HELPERS_OVERRIDE= DESCR PLIST PKGNAMEPREFIX PKGNAMESUFFIX
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801042006.w04K6mXj049641>