automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 1/2] maint: require perl 5.6.2 throughout


From: Stefano Lattarini
Subject: [PATCH 1/2] maint: require perl 5.6.2 throughout
Date: Sun, 4 Mar 2012 16:14:32 +0100

That version of perl is quite old already, so it should be OK to
require it.  More importantly, it is the older perl versions the
developers can currently use for testing, thus it's safer and more
honest to just require it throughout.  And anyway, we were already
requiring it in Automake::Getopt, which implied that both automake
and aclocal wouldn't have worked in practice with an older perl
version.

See also the discussion related to automake bug#10925.

* configure.ac: Verify that the perl interpreter has at least
version 5.6.2.
* lib/Automake/ChannelDefs.pm: Adjusted to require perl 5.6.2.
* lib/Automake/Channels.pm: Likewise.
* lib/Automake/Condition.pm: Likewise.
* lib/Automake/Configure_ac.pm: Likewise.
* lib/Automake/DisjConditions.pm: Likewise.
* lib/Automake/FileUtils.pm: Likewise.
* lib/Automake/General.pm: Likewise.
* lib/Automake/Item.pm: Likewise.
* lib/Automake/ItemDef.pm: Likewise.
* lib/Automake/Location.pm: Likewise.
* lib/Automake/Options.pm: Likewise.
* lib/Automake/Rule.pm: Likewise.
* lib/Automake/RuleDef.pm: Likewise.
* lib/Automake/Struct.pm: Likewise.
* lib/Automake/VarDef.pm: Likewise.
* lib/Automake/Variable.pm: Likewise.
* lib/Automake/Version.pm: Likewise.
* lib/Automake/Wrap.pm: Likewise.
* lib/Automake/XFile.pm: Likewise.
* : Likewise.
---
 configure.ac                   |    4 ++--
 lib/Automake/ChannelDefs.pm    |    2 +-
 lib/Automake/Channels.pm       |    2 +-
 lib/Automake/Condition.pm      |    2 ++
 lib/Automake/Configure_ac.pm   |    1 +
 lib/Automake/DisjConditions.pm |    3 ++-
 lib/Automake/FileUtils.pm      |    1 +
 lib/Automake/General.pm        |    2 +-
 lib/Automake/Item.pm           |    3 ++-
 lib/Automake/ItemDef.pm        |    2 ++
 lib/Automake/Location.pm       |    2 ++
 lib/Automake/Options.pm        |    1 +
 lib/Automake/Rule.pm           |    2 ++
 lib/Automake/RuleDef.pm        |    2 ++
 lib/Automake/Struct.pm         |    2 +-
 lib/Automake/VarDef.pm         |    2 ++
 lib/Automake/Variable.pm       |    2 ++
 lib/Automake/Version.pm        |    2 ++
 lib/Automake/Wrap.pm           |    1 +
 lib/Automake/XFile.pm          |    2 +-
 20 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index c8d5a34..40c27b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,9 +69,9 @@ if test -z "$PERL"; then
 fi
 # Save details about the selected perl interpreter in config.log.
 AM_RUN_LOG([$PERL --version])
-$PERL -e 'require 5.006;' || {
+$PERL -e 'require 5.006_002;' || {
    AC_MSG_ERROR(
-[perl 5.6 or better is required; perl 5.8.2 or better
+[perl 5.6.2 or better is required; perl 5.8.2 or better
 is recommended.  If you have several perl versions
 installed, select the one Automake should use using
   ./configure PERL=/path/to/perl])
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm
index afafae5..f14c79c 100644
--- a/lib/Automake/ChannelDefs.pm
+++ b/lib/Automake/ChannelDefs.pm
@@ -55,7 +55,7 @@ shorthand function to output on specific channels.
 
 =cut
 
-use 5.005;
+use 5.006_002;
 use strict;
 use Exporter;
 
diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm
index 4b5c5e2..40668fa 100644
--- a/lib/Automake/Channels.pm
+++ b/lib/Automake/Channels.pm
@@ -66,7 +66,7 @@ etc.) that can also be overridden on a per-message basis.
 
 =cut
 
-use 5.005;
+use 5.006_002;
 use strict;
 use Exporter;
 use Carp;
diff --git a/lib/Automake/Condition.pm b/lib/Automake/Condition.pm
index ee16f62..edcc656 100644
--- a/lib/Automake/Condition.pm
+++ b/lib/Automake/Condition.pm
@@ -14,6 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package Automake::Condition;
+
+use 5.006_002;
 use strict;
 use Carp;
 
diff --git a/lib/Automake/Configure_ac.pm b/lib/Automake/Configure_ac.pm
index d5c54da..5639dd0 100644
--- a/lib/Automake/Configure_ac.pm
+++ b/lib/Automake/Configure_ac.pm
@@ -20,6 +20,7 @@
 
 package Automake::Configure_ac;
 
+use 5.006_002;
 use strict;
 use Exporter;
 use Automake::Channels;
diff --git a/lib/Automake/DisjConditions.pm b/lib/Automake/DisjConditions.pm
index cb98495..534ad51 100644
--- a/lib/Automake/DisjConditions.pm
+++ b/lib/Automake/DisjConditions.pm
@@ -15,8 +15,9 @@
 
 package Automake::DisjConditions;
 
-use Carp;
+use 5.006_002;
 use strict;
+use Carp;
 use Automake::Condition qw/TRUE FALSE/;
 
 =head1 NAME
diff --git a/lib/Automake/FileUtils.pm b/lib/Automake/FileUtils.pm
index d73cebf..9584fda 100644
--- a/lib/Automake/FileUtils.pm
+++ b/lib/Automake/FileUtils.pm
@@ -34,6 +34,7 @@ This perl module provides various general purpose file 
handling functions.
 
 =cut
 
+use 5.006_002;
 use strict;
 use Exporter;
 use File::stat;
diff --git a/lib/Automake/General.pm b/lib/Automake/General.pm
index be57648..3c3b0ca 100644
--- a/lib/Automake/General.pm
+++ b/lib/Automake/General.pm
@@ -15,7 +15,7 @@
 
 package Automake::General;
 
-use 5.005;
+use 5.006_002;
 use strict;
 use Exporter;
 use File::Basename;
diff --git a/lib/Automake/Item.pm b/lib/Automake/Item.pm
index 0066ac4..0ef353a 100644
--- a/lib/Automake/Item.pm
+++ b/lib/Automake/Item.pm
@@ -14,9 +14,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package Automake::Item;
+
+use 5.006_002;
 use strict;
 use Carp;
-
 use Automake::ChannelDefs;
 use Automake::DisjConditions;
 
diff --git a/lib/Automake/ItemDef.pm b/lib/Automake/ItemDef.pm
index 8148df8..773a07b 100644
--- a/lib/Automake/ItemDef.pm
+++ b/lib/Automake/ItemDef.pm
@@ -14,6 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package Automake::ItemDef;
+
+use 5.006_002;
 use strict;
 use Carp;
 
diff --git a/lib/Automake/Location.pm b/lib/Automake/Location.pm
index ba24ca2..694ec3c8 100644
--- a/lib/Automake/Location.pm
+++ b/lib/Automake/Location.pm
@@ -15,6 +15,8 @@
 
 package Automake::Location;
 
+use 5.006_002;
+
 =head1 NAME
 
 Automake::Location - a class for location tracking, with a stack of contexts
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 651430d..dbefb44 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -15,6 +15,7 @@
 
 package Automake::Options;
 
+use 5.006_002;
 use strict;
 use Exporter;
 use Automake::Config;
diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index 0b8d867..1255d8c 100644
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -14,6 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package Automake::Rule;
+
+use 5.006_002;
 use strict;
 use Carp;
 
diff --git a/lib/Automake/RuleDef.pm b/lib/Automake/RuleDef.pm
index 738e377..d711633 100644
--- a/lib/Automake/RuleDef.pm
+++ b/lib/Automake/RuleDef.pm
@@ -14,6 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package Automake::RuleDef;
+
+use 5.006_002;
 use strict;
 use Carp;
 use Automake::ChannelDefs;
diff --git a/lib/Automake/Struct.pm b/lib/Automake/Struct.pm
index cd93691..564ab02 100644
--- a/lib/Automake/Struct.pm
+++ b/lib/Automake/Struct.pm
@@ -28,7 +28,7 @@ package Automake::Struct;
 
 ## See POD after __END__
 
-use 5.005_03;
+use 5.006_002;
 
 use strict;
 use vars qw(@ISA @EXPORT $VERSION);
diff --git a/lib/Automake/VarDef.pm b/lib/Automake/VarDef.pm
index d5b3224..375a268 100644
--- a/lib/Automake/VarDef.pm
+++ b/lib/Automake/VarDef.pm
@@ -14,6 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package Automake::VarDef;
+
+use 5.006_002;
 use strict;
 use Carp;
 use Automake::ChannelDefs;
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index f9ed7da..da69293 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -14,6 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package Automake::Variable;
+
+use 5.006_002;
 use strict;
 use Carp;
 
diff --git a/lib/Automake/Version.pm b/lib/Automake/Version.pm
index 35cfe8b..7a53298 100644
--- a/lib/Automake/Version.pm
+++ b/lib/Automake/Version.pm
@@ -14,6 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package Automake::Version;
+
+use 5.006_002;
 use strict;
 use Automake::ChannelDefs;
 
diff --git a/lib/Automake/Wrap.pm b/lib/Automake/Wrap.pm
index cd898dc..0f030dd 100644
--- a/lib/Automake/Wrap.pm
+++ b/lib/Automake/Wrap.pm
@@ -15,6 +15,7 @@
 
 package Automake::Wrap;
 
+use 5.006_002;
 use strict;
 
 require Exporter;
diff --git a/lib/Automake/XFile.pm b/lib/Automake/XFile.pm
index 1840f61..5456cb6 100644
--- a/lib/Automake/XFile.pm
+++ b/lib/Automake/XFile.pm
@@ -69,7 +69,7 @@ and C<getlines> methods to translate C<\r\n> to C<\n>.
 
 =cut
 
-require 5.000;
+use 5.006_002;
 use strict;
 use vars qw($VERSION @EXPORT @EXPORT_OK $AUTOLOAD @ISA);
 use Carp;
-- 
1.7.9




reply via email to

[Prev in Thread] Current Thread [Next in Thread]