pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Fixed a bug which prevented modified patches from s...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e6f3045681df
branches:  trunk
changeset: 499452:e6f3045681df
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Sep 22 18:21:00 2005 +0000

description:
Fixed a bug which prevented modified patches from stopping the build
process. In a pipe, each command may be executed as a child process.
Therefore variable assignments do not affect the parent process.

diffstat:

 mk/bsd.pkg.patch.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (20 lines):

diff -r 013f7a65a769 -r e6f3045681df mk/bsd.pkg.patch.mk
--- a/mk/bsd.pkg.patch.mk       Thu Sep 22 16:50:47 2005 +0000
+++ b/mk/bsd.pkg.patch.mk       Thu Sep 22 18:21:00 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.patch.mk,v 1.17 2005/07/31 05:26:50 snj Exp $
+# $NetBSD: bsd.pkg.patch.mk,v 1.18 2005/09/22 18:21:00 rillig Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and defines the
 # relevant variables and targets for the "patch" phase.
@@ -238,8 +238,8 @@
                                ${ECHO_MSG} "**************************************"; \
                                continue;                               \
                        fi;                                             \
-                       ${ECHO} "$$algsum" |                            \
-                       { read alg recorded;                            \
+                       set -- $$algsum;                                \
+                       { alg="$$1"; recorded="$$2";                    \
                          calcsum=`${SED} -e '/\$$NetBSD.*/d' $$i | ${DIGEST} $$alg`; \
                          ${ECHO_PATCH_MSG} "=> Verifying $$filename (using digest algorithm $$alg)"; \
                          if ${TEST} -z "$$recorded"; then              \



Home | Main Index | Thread Index | Old Index