Date: Thu, 4 Jan 2018 19:18:49 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458048 - head/Mk Message-ID: <201801041918.w04JInk4027446@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Jan 4 19:18:48 2018 New Revision: 458048 URL: https://svnweb.freebsd.org/changeset/ports/458048 Log: Stop truncating .MAKEOVERRIDES after the FLAVORS work. There is no such variable as ${MAKEOVERRIDES}, only ${.MAKEOVERRIDES}, so this code was simply truncating .MAKEOVERRIDES entirely which could cause performance and other odd issues with OSREL and make recursion. We don't want to leak FLAVOR to child sub-makes but that can be fixed later; this code was not doing what it intended. Approved by: portmgr (implicit) MFH: 2018Q1 Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu Jan 4 19:16:45 2018 (r458047) +++ head/Mk/bsd.port.mk Thu Jan 4 19:18:48 2018 (r458048) @@ -1081,9 +1081,6 @@ _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?201801041918.w04JInk4027446>