diff options
Diffstat (limited to 'lib/Automake/ChannelDefs.pm')
| -rw-r--r-- | lib/Automake/ChannelDefs.pm | 51 |
1 files changed, 10 insertions, 41 deletions
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm index bc53eae69..62f64a7e0 100644 --- a/lib/Automake/ChannelDefs.pm +++ b/lib/Automake/ChannelDefs.pm @@ -16,14 +16,6 @@ package Automake::ChannelDefs; use Automake::Config; -BEGIN -{ - if ($perl_threads) - { - require threads; - import threads; - } -} use Automake::Channels; =head1 NAME @@ -142,7 +134,7 @@ Informative messages. # Do not forget to update &usage and the manual # if you add or change a warning channel. -register_channel 'fatal', type => 'fatal', uniq_part => UP_NONE, ordered => 0; +register_channel 'fatal', type => 'fatal', uniq_part => UP_NONE; register_channel 'error', type => 'error'; register_channel 'error-gnu', type => 'error'; register_channel 'error-gnu/warn', type => 'error'; @@ -152,19 +144,17 @@ register_channel 'automake', type => 'fatal', backtrace => 1, "## Internal Error ##\n" . "####################\n"), footer => "\nPlease contact <$PACKAGE_BUGREPORT>.", - uniq_part => UP_NONE, ordered => 0; + uniq_part => UP_NONE; register_channel 'extra-portability', type => 'warning', silent => 1; register_channel 'gnu', type => 'warning'; register_channel 'obsolete', type => 'warning'; register_channel 'override', type => 'warning', silent => 1; register_channel 'portability', type => 'warning', silent => 1; -register_channel 'portability-recursive', type => 'warning', silent => 1; register_channel 'syntax', type => 'warning'; register_channel 'unsupported', type => 'warning'; -register_channel 'verb', type => 'debug', silent => 1, uniq_part => UP_NONE, - ordered => 0; +register_channel 'verb', type => 'debug', silent => 1, uniq_part => UP_NONE; register_channel 'note', type => 'debug', silent => 0; setup_channel_type 'warning', header => 'warning: '; @@ -249,8 +239,6 @@ C<--verbose> messages. sub verb ($;%) { my ($msg, %opts) = @_; - $msg = "thread " . threads->tid . ": " . $msg - if $perl_threads; msg 'verb', '', $msg, %opts; } @@ -292,37 +280,18 @@ sub switch_warning ($) elsif (channel_type ($cat) eq 'warning') { setup_channel $cat, silent => $has_no; - # - # Handling of portability warnings is trickier. For relevant tests, - # see 'dollarvar2', 'extra-portability' and 'extra-portability3'. - # - # -Wportability-recursive and -Wno-portability-recursive should not - # have any effect on other 'portability' or 'extra-portability' - # warnings, so there's no need to handle them separately or ad-hoc. - # + # Handling of portability warnings is trickier. + # See 'extra-portability.test'. if ($cat eq 'extra-portability' && ! $has_no) # -Wextra-portability { - # -Wextra-portability must enable 'portability' and - # 'portability-recursive' warnings. + # '-Wextra-portability' must enable 'portability' warnings. setup_channel 'portability', silent => 0; - setup_channel 'portability-recursive', silent => 0; } - if ($cat eq 'portability') # -Wportability or -Wno-portability + if ($cat eq 'portability' && $has_no) # -Wno-portability { - if ($has_no) # -Wno-portability - { - # -Wno-portability must disable 'extra-portability' and - # 'portability-recursive' warnings. - setup_channel 'portability-recursive', silent => 1; - setup_channel 'extra-portability', silent => 1; - } - else # -Wportability - { - # -Wportability must enable 'portability-recursive' - # warnings. But it should have no influence over the - # 'extra-portability' warnings. - setup_channel 'portability-recursive', silent => 0; - } + # '-Wno-portability' must disable 'extra-portability' + # warnings. + setup_channel 'extra-portability', silent => 1; } } else |