Date: Fri, 1 Dec 2017 12:11:58 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455280 - head/Mk Message-ID: <201712011211.vB1CBwho022323@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Fri Dec 1 12:11:58 2017 New Revision: 455280 URL: https://svnweb.freebsd.org/changeset/ports/455280 Log: Fix build-depends-list and run-depends-list. Sponsored by: Absolight Modified: head/Mk/bsd.port.mk (contents, props changed) Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Fri Dec 1 12:02:09 2017 (r455279) +++ head/Mk/bsd.port.mk Fri Dec 1 12:11:58 2017 (r455280) @@ -4040,6 +4040,8 @@ DEPENDS-LIST= \ ALL-DEPENDS-LIST= ${DEPENDS-LIST} -r ${_UNIFIED_DEPENDS:Q} MISSING-DEPENDS-LIST= ${DEPENDS-LIST} -m ${_UNIFIED_DEPENDS:Q} +BUILD-DEPENDS-LIST= ${DEPENDS-LIST} "${PKG_DEPENDS} ${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" +RUN-DEPENDS-LIST= ${DEPENDS-LIST} "${LIB_DEPENDS} ${RUN_DEPENDS}" TEST-DEPENDS-LIST= ${DEPENDS-LIST} ${TEST_DEPENDS:Q} CLEAN-DEPENDS-LIST= ${DEPENDS-LIST} -wr ${_UNIFIED_DEPENDS:Q} CLEAN-DEPENDS-LIMITED-LIST= ${DEPENDS-LIST} -w ${_UNIFIED_DEPENDS:Q} @@ -4172,36 +4174,10 @@ build-depends-list: @${BUILD-DEPENDS-LIST} .endif -BUILD-DEPENDS-LIST= \ - for dir in $$(${ECHO_CMD} "${PKG_DEPENDS} ${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${SED} -E -e 's,([^: ]*):([^: ]*)(:[^ ]*)?,\2,g' -e 'y/ /\n/'| ${SORT} -u); do \ - case $$dir in \ - /*) pdir=$$dir ;; \ - *) pdir=${PORTSDIR}/$$dir ;; \ - esac ; \ - if [ -d $$pdir ]; then \ - ${ECHO_CMD} $$pdir; \ - else \ - ${ECHO_MSG} "${PKGNAME}: \"$$pdir\" non-existent -- dependency list incomplete" >&2; \ - fi; \ - done | ${SORT} -u - run-depends-list: .if defined(LIB_DEPENDS) || defined(RUN_DEPENDS) @${RUN-DEPENDS-LIST} .endif - -RUN-DEPENDS-LIST= \ - for dir in $$(${ECHO_CMD} "${_LIB_RUN_DEPENDS:C,.*:([^:]*).*,\1,}" | ${SED} -e 'y/ /\n/' | ${SORT} -u); do \ - case $$dir in \ - /*) pdir=$$dir ;; \ - *) pdir=${PORTSDIR}/$$dir ;; \ - esac ; \ - if [ -d $$pdir ]; then \ - ${ECHO_CMD} $$pdir; \ - else \ - ${ECHO_MSG} "${PKGNAME}: \"$$pdir\" non-existent -- dependency list incomplete" >&2; \ - fi; \ - done | ${SORT} -u test-depends-list: .if defined(TEST_DEPENDS)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712011211.vB1CBwho022323>