diff options
| author | rillig <rillig@pkgsrc.org> | 2005-09-22 18:21:00 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-09-22 18:21:00 +0000 |
| commit | 1f8408e3a54a16d77a5e1110ae3c30b5449fc9fb (patch) | |
| tree | 423ab005b9088e36ed3dfaf5d60a40153dd9169f | |
| parent | 669e02a38e18549cc5c123ee96c8e3f57ca327bd (diff) | |
| download | pkgsrc-1f8408e3a54a16d77a5e1110ae3c30b5449fc9fb.tar.gz | |
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.
| -rw-r--r-- | mk/bsd.pkg.patch.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.pkg.patch.mk b/mk/bsd.pkg.patch.mk index b89759794eb..3d22ba9f80a 100644 --- a/mk/bsd.pkg.patch.mk +++ b/mk/bsd.pkg.patch.mk @@ -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 @@ do-pkgsrc-patch: ${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 \ |