Date: Thu, 4 Jan 2018 19:07:42 +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: r458041 - head/Mk Message-ID: <201801041907.w04J7gx3022494@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Jan 4 19:07:42 2018 New Revision: 458041 URL: https://svnweb.freebsd.org/changeset/ports/458041 Log: Fix package-depends-list for FLAVORS. Reported by: dinoex 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 17:50:28 2018 (r458040) +++ head/Mk/bsd.port.mk Thu Jan 4 19:07:42 2018 (r458041) @@ -4212,6 +4212,12 @@ PACKAGE-DEPENDS-LIST?= \ fi; \ checked="${PARENT_CHECKED}"; \ for dir in ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,}; do \ + case $${dir} in \ + *@*) \ + flavor=$${dir\#*@}; \ + dir=$${dir%@*}; \ + ;; \ + esac; \ case "$$dir" in \ /*) ;; \ *) dir=${PORTSDIR}/$$dir ;; \ @@ -4221,7 +4227,7 @@ PACKAGE-DEPENDS-LIST?= \ case $$checked in \ $$dir|$$dir\ *|*\ $$dir|*\ $$dir\ *) continue;; \ esac; \ - childout=$$(cd $$dir; ${MAKE} CHILD_DEPENDS=yes PARENT_CHECKED="$$checked" package-depends-list); \ + childout=$$(cd $$dir; FLAVOR=$${flavor} ${MAKE} CHILD_DEPENDS=yes PARENT_CHECKED="$$checked" package-depends-list); \ set -- $$childout; \ childdir=""; \ while [ $$\# != 0 ]; do \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801041907.w04J7gx3022494>