diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2018-01-05 03:37:24 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2018-01-05 03:37:24 +0800 |
| commit | 643355f210c665b534ebc33cbb38f21a57bd6f1b (patch) | |
| tree | 4d093a30a36b4c3ded68b2c7d4d90ee10593f9e4 /Mk | |
| parent | 7e14f16cb222b14545c433a3e2da50aba26c06fc (diff) | |
| download | freebsd-ports-gnome-643355f210c665b534ebc33cbb38f21a57bd6f1b.tar.gz freebsd-ports-gnome-643355f210c665b534ebc33cbb38f21a57bd6f1b.tar.zst freebsd-ports-gnome-643355f210c665b534ebc33cbb38f21a57bd6f1b.zip | |
Pass FLAVOR in enviroment to avoid forcing an empty value in some cases.
Approved by: portmgr (implicit)
MFH: 2018Q1
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index f9070030e8d3..accc963769ce 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -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 |