diff options
| author | rillig <rillig@pkgsrc.org> | 2006-02-13 15:37:49 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-02-13 15:37:49 +0000 |
| commit | b61c6ea237da5300b593bd4df99640b5ed941eb5 (patch) | |
| tree | 1e8d47918317db00ba24be37c963173b354e2d3f /pkgtools | |
| parent | eb2b18657cf0109ce5a4a6f04c1776d3c1f817f3 (diff) | |
| download | pkgsrc-b61c6ea237da5300b593bd4df99640b5ed941eb5.tar.gz | |
- Including "options.mk" does not qualify to using common Makefiles, which
would suppress the variable order checking.
- Added an additional debugging statement to the variable ordering.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index a4e9723efe4..a0846adcf2a 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.pl,v 1.513 2006/02/13 15:20:22 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.514 2006/02/13 15:37:49 rillig Exp $ # # pkglint - static analyzer and checker for pkgsrc packages @@ -1974,7 +1974,8 @@ sub readmakefile($$$$) { if ($includefile =~ qr"(?:^|/)Makefile.common$" || ($includefile =~ qr"^(?:\.\./(\.\./[^/]+/)?[^/]+/)?([^/]+)$" && (!defined($1) || $1 ne "../mk") - && $2 ne "buildlink3.mk")) { + && $2 ne "buildlink3.mk" + && $2 ne "options.mk")) { $line->log_debug("including ${includefile} sets seen_Makefile_common."); $seen_Makefile_common = true; } @@ -3349,6 +3350,8 @@ sub checklines_package_Makefile_varorder($) { my $line = $lines->[$lineno]; my $text = $line->text; + $line->log_debug("[varorder] section ${sectindex} variable ${varindex}."); + if ($next_section) { $next_section = false; $sectindex++; |