diff options
| author | rillig <rillig@pkgsrc.org> | 2006-07-21 19:09:23 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-07-21 19:09:23 +0000 |
| commit | e2d5f766fa614e153175d86284eada1a6f566ac0 (patch) | |
| tree | 990da282b6d304c570d583adfd705f9a8fe63517 /pkgtools | |
| parent | 898a0c5f986aee4e6b2601edbfcfb68aee7fdb34 (diff) | |
| download | pkgsrc-e2d5f766fa614e153175d86284eada1a6f566ac0.tar.gz | |
Fixed the regular expression to detect whether USE_LANGUAGES contains
"c" or not.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/makevars.map | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map index 89e81b3def9..5afb4b1fbdc 100644 --- a/pkgtools/pkglint/files/makevars.map +++ b/pkgtools/pkglint/files/makevars.map @@ -1,4 +1,4 @@ -# $NetBSD: makevars.map,v 1.132 2006/07/18 18:14:33 rillig Exp $ +# $NetBSD: makevars.map,v 1.133 2006/07/21 19:09:23 rillig Exp $ # # This file contains the guessed type of some variables, according to @@ -638,7 +638,7 @@ USE_GNU_READLINE Yes [m:s,c:s,o:s] USE_IMAKE Yes [m:s] USE_JAVA { run yes } [m:s] USE_JAVA2 { YES yes 1.4 1.5 } [m:s] -USE_LANGUAGES List of { c c++ fortran java objc } [m:as,c:as,o:a] +USE_LANGUAGES List of { c c++ fortran java objc } [m:s,c:s,o:s] USE_LIBTOOL Yes [m:s,c:s] USE_MAKEINFO Yes [$package] USE_MSGFMT_PLURALS Yes [$package] diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index d9ce98830ea..6ccbba3af60 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.pl,v 1.658 2006/07/21 05:02:52 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.659 2006/07/21 19:09:23 rillig Exp $ # # pkglint - static analyzer and checker for pkgsrc packages @@ -6281,7 +6281,7 @@ sub checkfile_package_Makefile($$$) { if ($languages_line->text =~ regex_varassign) { my (undef, $op, $value, undef) = ($1, $2, $3, $4); - if ($value !~ qr"\bc\b") { + if ($value !~ qr"(?:^|\s+)c(?:\s+|$)") { $pkgctx_vardef->{"GNU_CONFIGURE"}->log_warning("GNU_CONFIGURE almost always needs a C compiler, ..."); $languages_line->log_warning("... but \"c\" is not added to USE_LANGUAGES."); } |