diff options
| author | joerg <joerg@pkgsrc.org> | 2006-10-09 08:57:39 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-10-09 08:57:39 +0000 |
| commit | e1d0676eb70538f664325891aac3896985a13e41 (patch) | |
| tree | 5e20cf0f59a6c0566b1297dd3ea3af0ea61199da /mk | |
| parent | 6e95a1c2681e10a8bc32d94b48b47e02e168b583 (diff) | |
| download | pkgsrc-e1d0676eb70538f664325891aac3896985a13e41.tar.gz | |
Backout rev 1.13 of rillig. Addresses PR 34764 and complains on
pkgsrc-users.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/flavor/pkg/depends.mk | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/mk/flavor/pkg/depends.mk b/mk/flavor/pkg/depends.mk index fc28921d9c5..fac7886c49a 100644 --- a/mk/flavor/pkg/depends.mk +++ b/mk/flavor/pkg/depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: depends.mk,v 1.13 2006/10/09 01:40:49 rillig Exp $ +# $NetBSD: depends.mk,v 1.14 2006/10/09 08:57:39 joerg Exp $ _DEPENDS_FILE= ${WRKDIR}/.depends _REDUCE_DEPENDS_CMD= ${SETENV} CAT=${CAT:Q} \ @@ -42,26 +42,24 @@ depends-cookie: ${_DEPENDS_FILE} ${_DEPENDS_FILE}: ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG} set -e; \ - ${_REDUCE_DEPENDS_CMD} ${BUILD_DEPENDS:Q} > ${.TARGET}.tmp; \ + ${_PKG_SILENT}${_PKG_DEBUG} \ + ${_REDUCE_DEPENDS_CMD} ${BUILD_DEPENDS:Q} | \ while read dep; do \ pattern=`${ECHO} $$dep | ${SED} -e "s,:.*,,"`; \ dir=`${ECHO} $$dep | ${SED} -e "s,.*:,,"`; \ ${TEST} -n "$$pattern" || exit 1; \ ${TEST} -n "$$dir" || exit 1; \ ${ECHO} "build $$pattern $$dir"; \ - done < ${.TARGET}.tmp >> ${.TARGET}.tmp1 - ${_PKG_SILENT}${_PKG_DEBUG} set -e; \ - ${_REDUCE_DEPENDS_CMD} ${DEPENDS:Q} > ${.TARGET}.tmp; \ + done >> ${.TARGET} + ${_PKG_SILENT}${_PKG_DEBUG} \ + ${_REDUCE_DEPENDS_CMD} ${DEPENDS:Q} | \ while read dep; do \ pattern=`${ECHO} $$dep | ${SED} -e "s,:.*,,"`; \ dir=`${ECHO} $$dep | ${SED} -e "s,.*:,,"`; \ ${TEST} -n "$$pattern" || exit 1; \ ${TEST} -n "$$dir" || exit 1; \ ${ECHO} "full $$pattern $$dir"; \ - done < ${.TARGET}.tmp >> ${.TARGET}.tmp2 - ${_PKG_DEBUG}${_PKG_SILENT} \ - cat ${.TARGET}.tmp1 ${.TARGET.tmp2} >> ${.TARGET} + done >> ${.TARGET} ###################################################################### ### depends-install (PRIVATE, pkgsrc/mk/depends/depends.mk) |