Date: Thu, 4 Jan 2018 19:37:24 +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: r458050 - head/Mk Message-ID: <201801041937.w04JbO6V036163@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Jan 4 19:37:24 2018 New Revision: 458050 URL: https://svnweb.freebsd.org/changeset/ports/458050 Log: Pass FLAVOR in enviroment to avoid forcing an empty value in some cases. 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:19:11 2018 (r458049) +++ head/Mk/bsd.port.mk Thu Jan 4 19:37:24 2018 (r458050) @@ -3805,7 +3805,7 @@ CLEAN_DEPENDENCIES= .if !defined(NOCLEANDEPENDS) CLEAN_DEPENDENCIES+= limited-clean-depends-${_f} limited-clean-depends-${_f}: - @cd ${.CURDIR} && ${MAKE} FLAVOR=${_f} limited-clean-depends + @cd ${.CURDIR} && ${SETENV} FLAVOR=${_f} ${MAKE} limited-clean-depends .endif .if target(pre-clean) CLEAN_DEPENDENCIES+= pre-clean-${_f} @@ -4081,7 +4081,7 @@ fetch-specials: /*) ;; \ *) dir=${PORTSDIR}/$$dir ;; \ esac; \ - (cd $$dir; ${MAKE} FLAVOR=$${flavor} fetch); \ + (cd $$dir; ${SETENV} FLAVOR=$${flavor} ${MAKE} fetch); \ done .endif @@ -4224,7 +4224,7 @@ PACKAGE-DEPENDS-LIST?= \ case $$checked in \ $$dir|$$dir\ *|*\ $$dir|*\ $$dir\ *) continue;; \ esac; \ - childout=$$(cd $$dir; FLAVOR=$${flavor} ${MAKE} CHILD_DEPENDS=yes PARENT_CHECKED="$$checked" package-depends-list); \ + childout=$$(cd $$dir; ${SETENV} FLAVOR=$${flavor} ${MAKE} CHILD_DEPENDS=yes PARENT_CHECKED="$$checked" package-depends-list); \ set -- $$childout; \ childdir=""; \ while [ $$\# != 0 ]; do \ @@ -4374,7 +4374,7 @@ describe: describe: ${FLAVORS:S/^/describe-/} . for f in ${FLAVORS} describe-${f}: - @cd ${.CURDIR} && ${MAKE} -B FLAVOR=${f} -D_DESCRIBE_WITH_FLAVOR describe + @cd ${.CURDIR} && ${SETENV} FLAVOR=${f} ${MAKE} -B -D_DESCRIBE_WITH_FLAVOR describe . endfor . endif # empty(FLAVORS) . endif @@ -4664,7 +4664,7 @@ pretty-flavors-package-names: .PHONY .else .for f in ${FLAVORS} @${ECHO_CMD} -n "${f}: " - @cd ${.CURDIR} && ${MAKE} -B FLAVOR=${f} -V PKGNAME + @cd ${.CURDIR} && ${SETENV} FLAVOR=${f} ${MAKE} -B -V PKGNAME .endfor .endif @@ -4673,7 +4673,7 @@ flavors-package-names: .PHONY @${ECHO_CMD} "${PKGNAME}" .else .for f in ${FLAVORS} - @cd ${.CURDIR} && ${MAKE} -B FLAVOR=${f} -V PKGNAME + @cd ${.CURDIR} && ${SETENV} FLAVOR=${f} ${MAKE} -B -V PKGNAME .endfor .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801041937.w04JbO6V036163>