diff options
| author | rillig <rillig@pkgsrc.org> | 2006-11-09 14:41:18 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-11-09 14:41:18 +0000 |
| commit | e49f88c9efd10edaa0f31b0fd43dae93d19f9702 (patch) | |
| tree | 94edf638acecff997f2e70cf7c12a7cc827ea455 | |
| parent | ffe459f4de4bf51af76d9a431a95d4e93f3265b0 (diff) | |
| download | pkgsrc-e49f88c9efd10edaa0f31b0fd43dae93d19f9702.tar.gz | |
Fixed the SKIP_FILTER command so that NetBSD's ksh can handle it as well.
| -rw-r--r-- | mk/check/check-headers.mk | 4 | ||||
| -rw-r--r-- | mk/check/check-headers.sh | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/mk/check/check-headers.mk b/mk/check/check-headers.mk index 1fcd04a6e57..2a0c22c885f 100644 --- a/mk/check/check-headers.mk +++ b/mk/check/check-headers.mk @@ -1,4 +1,4 @@ -# $NetBSD: check-headers.mk,v 1.1 2006/11/09 02:53:15 rillig Exp $ +# $NetBSD: check-headers.mk,v 1.2 2006/11/09 14:41:18 rillig Exp $ # # This file checks the C and C++ header files for possible problems. # @@ -33,5 +33,5 @@ _check-headers: [ -d ${WRKSRC}/. ] || exit 0; \ cd ${WRKSRC}; \ env PKGSRCDIR=${PKGSRCDIR:Q} \ - SKIP_FILTER=${CHECK_HEADERS_SKIP:@p@${p}) continue;;@:Q} \ + SKIP_FILTER=${CHECK_HEADERS_SKIP:@p@${p}) skip=yes;;@:Q} \ sh ${PKGSRCDIR}/mk/check/check-headers.sh diff --git a/mk/check/check-headers.sh b/mk/check/check-headers.sh index db36345997d..d8dbb500764 100644 --- a/mk/check/check-headers.sh +++ b/mk/check/check-headers.sh @@ -1,4 +1,4 @@ -# $NetBSD: check-headers.sh,v 1.5 2006/11/09 10:52:21 rillig Exp $ +# $NetBSD: check-headers.sh,v 1.6 2006/11/09 14:41:18 rillig Exp $ # # This program checks the header files for possible problems. # @@ -21,7 +21,7 @@ check_header() { # Check for "${" in macro definitions. case "$line" in - "#define"*"\${"*) + "#define"*"\"\${"[a-z]*"}"*"\""*) found_unresolved_variable=yes cs_error_heading "Found unresolved variable in macro:" cs_error_msg "$fname: $line" @@ -35,7 +35,9 @@ find * -type f -print 2>/dev/null \ | { while read fname; do - eval "case \"\$fname\" in $SKIP_FILTER *.orig) continue;; esac" + skip=no + eval "case \"\$fname\" in $SKIP_FILTER *.orig) skip=yes;; esac" + [ $skip = no ] || continue case "$fname" in *.h | *.hpp | *.h++ | *.hxx) |