[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: perl-5.6-isms (Was: Re: Problem with symlinks and VPATH Builds)
From: |
Paul Eggert |
Subject: |
Re: perl-5.6-isms (Was: Re: Problem with symlinks and VPATH Builds) |
Date: |
Sun, 15 Sep 2002 22:02:46 -0700 (PDT) |
> From: Alexandre Duret-Lutz <address@hidden>
> Date: 15 Sep 2002 22:08:13 +0200
>
> >> From: Alexandre Duret-Lutz <address@hidden>
> >> Date: Thu, 05 Sep 2002 16:58:00 +0200
> >>
> >> FWIW, I've installed CVS Automake on Solaris 8 today and fixed a
> >> few things until `make check' succeed. Still that was with perl
> >> 5.6, and without libtool/texinfo/gcj (32 tests were skipped), so
> >> I guess it won't help much :(
>
> Paul> Thanks, I'll merge it into my private copy when I get the time. I
> Paul> have fixed some of the 5.6-isms in my copy of Automake but I still
> Paul> don't have a clean 'make check', so I'm reluctant to check them in.
>
> Hi Paul, any news from this? If you don't have the time to dig
> `make check' results, could you send your diff anyway?
OK, I installed what I have, as follows. I'll try to see whether the
result runs on Solaris 8 for me. I do see a couple of other other
obvious minor problems and will install patches for them too.
2002-09-15 Paul Eggert <address@hidden>
* lib/Automake/Channels.pm: Don't use 'our', as it isn't portable
to Perl 5.00503.
===================================================================
RCS file: /cvs/automake/automake/lib/Automake/Channels.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -p -u -r1.4 -r1.5
--- Channels.pm 10 Sep 2002 20:45:58 -0000 1.4
+++ Channels.pm 16 Sep 2002 04:50:51 -0000 1.5
@@ -1,4 +1,4 @@
-# Copyright 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -62,18 +62,19 @@ use Exporter;
use Carp;
use File::Basename;
-our @ISA = qw (Exporter);
-our @EXPORT = qw ($exit_code $warnings_are_errors
- &reset_local_duplicates &reset_global_duplicates
- ®ister_channel &msg &exists_channel &channel_type
- &setup_channel &setup_channel_type
- &dup_channel_setup &drop_channel_setup
- &buffer_messages &flush_messages
- US_GLOBAL US_LOCAL
- UP_NONE UP_TEXT UP_LOC_TEXT);
+use vars qw (@ISA @EXPORT %channels $me);
-our %channels;
-our $me = basename $0;
address@hidden = qw (Exporter);
address@hidden = qw ($exit_code $warnings_are_errors
+ &reset_local_duplicates &reset_global_duplicates
+ ®ister_channel &msg &exists_channel &channel_type
+ &setup_channel &setup_channel_type
+ &dup_channel_setup &drop_channel_setup
+ &buffer_messages &flush_messages
+ US_GLOBAL US_LOCAL
+ UP_NONE UP_TEXT UP_LOC_TEXT);
+
+$me = basename $0;
=head2 Global Variables
@@ -86,7 +87,8 @@ the C<exit_code> options of C<fatal> and
=cut
-our $exit_code = 0;
+use vars qw ($exit_code);
+$exit_code = 0;
=item C<$warnings_are_errors>
@@ -95,7 +97,8 @@ errors (i.e. if they should update C<$ex
=cut
-our $warnings_are_errors = 0;
+use vars qw ($warnings_are_errors);
+$warnings_are_errors = 0;
=back
@@ -194,8 +197,11 @@ Die with a stack backtrace after display
=cut
+use vars qw (%_default_options %_global_duplicate_messages
+ %_local_duplicate_messages);
+
# Default options for a channel.
-our %_default_options =
+%_default_options =
(
type => 'warning',
exit_code => 1,
@@ -211,8 +217,8 @@ our %_default_options =
# Filled with output messages as keys, to detect duplicates.
# The value associated to each keys is the number of occurences
# filtered out.
-our %_local_duplicate_messages = ();
-our %_global_duplicate_messages = ();
+%_local_duplicate_messages = ();
+%_global_duplicate_messages = ();
sub _reset_duplicates (\%)
{
@@ -435,9 +441,12 @@ both print
=cut
+
+use vars qw (@backlog %buffering);
+
# See buffer_messages() and flush_messages() below.
-our %buffering = (); # The map of channel types to buffer.
-our @backlog = (); # The buffer of messages.
+%buffering = (); # The map of channel types to buffer.
address@hidden = (); # The buffer of messages.
sub msg ($$;$%)
{
@@ -524,7 +533,8 @@ entry, while C<drop_channel_setup ()> ju
=cut
-our @_saved_channels = ();
+use vars qw (@_saved_channels);
address@hidden = ();
sub dup_channel_setup ()
{