summaryrefslogtreecommitdiff
path: root/mk/flavor
diff options
context:
space:
mode:
authorrillig <rillig>2006-11-26 11:51:30 +0000
committerrillig <rillig>2006-11-26 11:51:30 +0000
commit4ea7e6227140f2bdb83d4cb260a43dc304fe73e2 (patch)
tree8adfe3ae59c83d731148b64edc795f948c0ec1d6 /mk/flavor
parentefa86578601670f925885e1f769179e803eee44e (diff)
downloadpkgsrc-4ea7e6227140f2bdb83d4cb260a43dc304fe73e2.tar.gz
As the pkglint warning says, the pipe operator discards the exit status of
its left hand side. Fixed that by using temporary files.
Diffstat (limited to 'mk/flavor')
-rw-r--r--mk/flavor/pkg/depends.mk14
1 files changed, 8 insertions, 6 deletions
diff --git a/mk/flavor/pkg/depends.mk b/mk/flavor/pkg/depends.mk
index fac7886c49a..1d9a6f5af33 100644
--- a/mk/flavor/pkg/depends.mk
+++ b/mk/flavor/pkg/depends.mk
@@ -1,4 +1,4 @@
-# $NetBSD: depends.mk,v 1.14 2006/10/09 08:57:39 joerg Exp $
+# $NetBSD: depends.mk,v 1.15 2006/11/26 11:51:30 rillig Exp $
_DEPENDS_FILE= ${WRKDIR}/.depends
_REDUCE_DEPENDS_CMD= ${SETENV} CAT=${CAT:Q} \
@@ -41,9 +41,10 @@ depends-cookie: ${_DEPENDS_FILE}
${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${_DEPENDS_FILE} ${_COOKIE.depends}
${_DEPENDS_FILE}:
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
- ${_PKG_SILENT}${_PKG_DEBUG} \
- ${_REDUCE_DEPENDS_CMD} ${BUILD_DEPENDS:Q} | \
+ ${RUN} ${MKDIR} ${.TARGET:H}
+ ${RUN} ${_REDUCE_DEPENDS_CMD} ${BUILD_DEPENDS:Q} > ${.TARGET}.tmp
+ ${RUN} \
+ exec 0< ${.TARGET}.tmp; \
while read dep; do \
pattern=`${ECHO} $$dep | ${SED} -e "s,:.*,,"`; \
dir=`${ECHO} $$dep | ${SED} -e "s,.*:,,"`; \
@@ -51,8 +52,9 @@ ${_DEPENDS_FILE}:
${TEST} -n "$$dir" || exit 1; \
${ECHO} "build $$pattern $$dir"; \
done >> ${.TARGET}
- ${_PKG_SILENT}${_PKG_DEBUG} \
- ${_REDUCE_DEPENDS_CMD} ${DEPENDS:Q} | \
+ ${RUN} ${_REDUCE_DEPENDS_CMD} ${DEPENDS:Q} > ${.TARGET}.tmp \
+ ${RUN} \
+ exec 0< ${.TARGET}.tmp; \
while read dep; do \
pattern=`${ECHO} $$dep | ${SED} -e "s,:.*,,"`; \
dir=`${ECHO} $$dep | ${SED} -e "s,.*:,,"`; \