Date: Fri, 20 Oct 2017 17:07:23 +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: r452543 - head/Mk Message-ID: <201710201707.v9KH7NhB055875@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Oct 20 17:07:23 2017 New Revision: 452543 URL: https://svnweb.freebsd.org/changeset/ports/452543 Log: FLAVORS: Fix 'make clean' not respecting passed in FLAVOR. With hat: portmgr Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Fri Oct 20 16:51:15 2017 (r452542) +++ head/Mk/bsd.port.mk Fri Oct 20 17:07:23 2017 (r452543) @@ -1061,6 +1061,10 @@ STAGEDIR?= ${WRKDIR}/stage NOTPHONY?= FLAVORS?= FLAVOR?= +# Store env FLAVOR for later +.if !defined(_FLAVOR) +_FLAVOR:= ${FLAVOR} +.endif # XXX: We have no real FLAVORS support in ports or tools yet. #PORTS_FEATURES+= FLAVORS MINIMAL_PKG_VERSION= 1.6.0 @@ -3748,7 +3752,12 @@ post-clean-noflavor: clean: ${CLEAN_DEPENDENCIES} .endif -.for _f in ${FLAVORS} +.if !empty(_FLAVOR) +_CLEANFLAVORS= ${_FLAVOR} +.else +_CLEANFLAVORS= ${FLAVORS} +.endif +.for _f in ${_CLEANFLAVORS} CLEAN_DEPENDENCIES= .if !defined(NOCLEANDEPENDS) CLEAN_DEPENDENCIES+= limited-clean-depends-${_f}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710201707.v9KH7NhB055875>