svn commit: r458052 - branches/2018Q1/Mk
Bryan Drewery
bdrewery at FreeBSD.org
Thu Jan 4 19:41:04 UTC 2018
Author: bdrewery
Date: Thu Jan 4 19:41:02 2018
New Revision: 458052
URL: https://svnweb.freebsd.org/changeset/ports/458052
Log:
MFH: r458050
Pass FLAVOR in enviroment to avoid forcing an empty value in some cases.
Approved by: portmgr (implicit)
Modified:
branches/2018Q1/Mk/bsd.port.mk
Directory Properties:
branches/2018Q1/ (props changed)
Modified: branches/2018Q1/Mk/bsd.port.mk
==============================================================================
--- branches/2018Q1/Mk/bsd.port.mk Thu Jan 4 19:37:58 2018 (r458051)
+++ branches/2018Q1/Mk/bsd.port.mk Thu Jan 4 19:41:02 2018 (r458052)
@@ -3806,7 +3806,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}
@@ -4082,7 +4082,7 @@ fetch-specials:
/*) ;; \
*) dir=${PORTSDIR}/$$dir ;; \
esac; \
- (cd $$dir; ${MAKE} FLAVOR=$${flavor} fetch); \
+ (cd $$dir; ${SETENV} FLAVOR=$${flavor} ${MAKE} fetch); \
done
.endif
@@ -4225,7 +4225,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 \
@@ -4375,7 +4375,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
@@ -4665,7 +4665,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
@@ -4674,7 +4674,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
More information about the svn-ports-branches
mailing list