diff options
| author | rillig <rillig@pkgsrc.org> | 2007-05-25 14:21:32 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-05-25 14:21:32 +0000 |
| commit | 72a55e9e864627027cb7bffca01491d1626203cd (patch) | |
| tree | a3e2651e42b94271fafc63fbe7e3d05534edb032 /mk | |
| parent | 95556b766aeb9be5b2779d761f913ead27928fba (diff) | |
| download | pkgsrc-72a55e9e864627027cb7bffca01491d1626203cd.tar.gz | |
When testing whether the patches/ directory exists or not, take into
account that CVS usually leaves empty directories around. This fixes the
bootstrapping after a "cvs update" without the -P option. The error
message leading to it was:
===> running: (cd /home/p/src/devel/bmake && /home/p/pkg/bin/bmake -s
-DPKG_PRESERVE MAKECONF=/home/p/work/mk.conf.example
WRKOBJDIR=/home/p/work/pkgsrc bootstrap-register)
ERROR: [resolve-dependencies] A package matching ``digest>=20010302'' should
ERROR: be installed, but one cannot be found. Perhaps there is a
ERROR: stale work directory for ../../pkgtools/digest?
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/patch/bsd.patch-vars.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mk/patch/bsd.patch-vars.mk b/mk/patch/bsd.patch-vars.mk index c487713c018..2c705c5311b 100644 --- a/mk/patch/bsd.patch-vars.mk +++ b/mk/patch/bsd.patch-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.patch-vars.mk,v 1.3 2006/07/13 14:02:34 jlam Exp $ +# $NetBSD: bsd.patch-vars.mk,v 1.4 2007/05/25 14:21:32 rillig Exp $ # # This Makefile fragment is included separately by bsd.pkg.mk and # defines some variables which must be defined earlier than where @@ -31,9 +31,17 @@ USE_TOOLS+= patch .endif +# Just testing whether the directories exist or not is not enough. +# There may be directories that are empty except for the CVS metafiles. +# This complicated test is necessary to not record pkgtools/digest +# as a dependency for devel/bmake. .if (defined(PATCHDIR) && exists(${PATCHDIR})) || \ (defined(LOCALPATCHES) && exists(${LOCALPATCHES}/${PKGPATH})) +_patches!= echo ${PATCHDIR}/* ${LOCALPATCHES}/${PKGPATH}/* +_patches:= ${_patches:N*/CVS:N*/\*} +. if !empty(_patches) USE_TOOLS+= digest:bootstrap +. endif .endif # These tools are used to output the contents of the distribution patches |