From owner-svn-ports-head@freebsd.org  Thu Jan  4 19:18:50 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 439A2EAFC77;
 Thu,  4 Jan 2018 19:18:50 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 10AE37ACFD;
 Thu,  4 Jan 2018 19:18:49 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w04JInNf027447;
 Thu, 4 Jan 2018 19:18:49 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w04JInk4027446;
 Thu, 4 Jan 2018 19:18:49 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201801041918.w04JInk4027446@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 4 Jan 2018 19:18:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r458048 - head/Mk
X-SVN-Group: ports-head
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: head/Mk
X-SVN-Commit-Revision: 458048
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Jan 2018 19:18:50 -0000

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