From 0e127700bdc1c96590d01d55ecd48b0864292c4f Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Tue, 7 Feb 2023 22:39:29 -0600 Subject: Revert "maint: require perl 5.010 or later" This reverts commit 4e3744a15c4d8bdb46c11ead2fb56c5f591b714b. Copyright-paperwork-exempt: yes --- NEWS | 6 +----- bin/aclocal.in | 2 +- bin/automake.in | 2 +- configure.ac | 5 +++-- lib/Automake/ChannelDefs.pm | 2 +- lib/Automake/Channels.pm | 2 +- lib/Automake/Condition.pm | 2 +- lib/Automake/Config.in | 2 +- lib/Automake/Configure_ac.pm | 2 +- lib/Automake/DisjConditions.pm | 2 +- lib/Automake/FileUtils.pm | 2 +- lib/Automake/General.pm | 2 +- lib/Automake/Getopt.pm | 2 +- lib/Automake/Item.pm | 2 +- lib/Automake/ItemDef.pm | 2 +- lib/Automake/Language.pm | 2 +- lib/Automake/Location.pm | 2 +- lib/Automake/Options.pm | 2 +- lib/Automake/Rule.pm | 2 +- lib/Automake/RuleDef.pm | 2 +- lib/Automake/VarDef.pm | 2 +- lib/Automake/Variable.pm | 2 +- lib/Automake/Version.pm | 2 +- lib/Automake/Wrap.pm | 2 +- lib/Automake/XFile.pm | 2 +- 25 files changed, 27 insertions(+), 30 deletions(-) diff --git a/NEWS b/NEWS index 132a33097..b73c92569 100644 --- a/NEWS +++ b/NEWS @@ -5,10 +5,6 @@ please see NEWS-2.0 and start following the advice there now. New in 1.17: -* Version requirements: - - - Perl 5.10 (2007) or greater is required. - * New features added - RANLIB may be overridden on a per-target basis. @@ -870,7 +866,7 @@ New in 1.13: include directories. Formerly, one had to specify it with an explicit '-I' option to the 'aclocal' invocation. - - The special make variable ACLOCAL_AMFLAGS may be deprecated in + - The special make variable ACLOCAL_AMFLAGS may be deprecated in a future Automake major release. * The depcomp script: diff --git a/bin/aclocal.in b/bin/aclocal.in index 34c253048..f04cb30d8 100644 --- a/bin/aclocal.in +++ b/bin/aclocal.in @@ -19,7 +19,7 @@ # Written by Tom Tromey , and # Alexandre Duret-Lutz . -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/bin/automake.in b/bin/automake.in index f249064d5..1c13a3187 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -22,7 +22,7 @@ package Automake; -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/configure.ac b/configure.ac index bf72023e2..dcf2d9556 100644 --- a/configure.ac +++ b/configure.ac @@ -73,9 +73,10 @@ 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.010;' || { +$PERL -e 'require 5.006;' || { AC_MSG_ERROR( -[perl 5.10 (2007) or better is required. If you have several perl versions +[perl 5.6 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 bfe5ba548..1c436645e 100644 --- a/lib/Automake/ChannelDefs.pm +++ b/lib/Automake/ChannelDefs.pm @@ -44,7 +44,7 @@ shorthand function to output on specific channels. =cut -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm index 5a36c93af..b4563d36e 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.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/lib/Automake/Condition.pm b/lib/Automake/Condition.pm index d1e6811e8..31ac81d80 100644 --- a/lib/Automake/Condition.pm +++ b/lib/Automake/Condition.pm @@ -15,7 +15,7 @@ package Automake::Condition; -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in index 3cc094d15..4fc918b58 100644 --- a/lib/Automake/Config.in +++ b/lib/Automake/Config.in @@ -17,7 +17,7 @@ package Automake::Config; -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/lib/Automake/Configure_ac.pm b/lib/Automake/Configure_ac.pm index d4751ee26..efd428e2a 100644 --- a/lib/Automake/Configure_ac.pm +++ b/lib/Automake/Configure_ac.pm @@ -20,7 +20,7 @@ package Automake::Configure_ac; -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/lib/Automake/DisjConditions.pm b/lib/Automake/DisjConditions.pm index 7612f607c..16540e7da 100644 --- a/lib/Automake/DisjConditions.pm +++ b/lib/Automake/DisjConditions.pm @@ -15,7 +15,7 @@ package Automake::DisjConditions; -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/lib/Automake/FileUtils.pm b/lib/Automake/FileUtils.pm index 6e9796a98..697ff7e63 100644 --- a/lib/Automake/FileUtils.pm +++ b/lib/Automake/FileUtils.pm @@ -34,7 +34,7 @@ This perl module provides various general purpose file handling functions. =cut -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/lib/Automake/General.pm b/lib/Automake/General.pm index 4b977505d..4c1d0630f 100644 --- a/lib/Automake/General.pm +++ b/lib/Automake/General.pm @@ -15,7 +15,7 @@ package Automake::General; -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/lib/Automake/Getopt.pm b/lib/Automake/Getopt.pm index 3b37d64a3..67958fd62 100644 --- a/lib/Automake/Getopt.pm +++ b/lib/Automake/Getopt.pm @@ -30,7 +30,7 @@ line options in conformance to the GNU Coding standards. =cut -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/lib/Automake/Item.pm b/lib/Automake/Item.pm index a2e6c1420..a2637c6e1 100644 --- a/lib/Automake/Item.pm +++ b/lib/Automake/Item.pm @@ -15,7 +15,7 @@ package Automake::Item; -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/lib/Automake/ItemDef.pm b/lib/Automake/ItemDef.pm index ca9bbb1eb..3e958a8ff 100644 --- a/lib/Automake/ItemDef.pm +++ b/lib/Automake/ItemDef.pm @@ -15,7 +15,7 @@ package Automake::ItemDef; -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/lib/Automake/Language.pm b/lib/Automake/Language.pm index 12a29bee4..8cd866dde 100644 --- a/lib/Automake/Language.pm +++ b/lib/Automake/Language.pm @@ -15,7 +15,7 @@ package Automake::Language; -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/lib/Automake/Location.pm b/lib/Automake/Location.pm index 77b059937..21d08f7d2 100644 --- a/lib/Automake/Location.pm +++ b/lib/Automake/Location.pm @@ -15,7 +15,7 @@ package Automake::Location; -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm index aee183169..69fc2ecb5 100644 --- a/lib/Automake/Options.pm +++ b/lib/Automake/Options.pm @@ -15,7 +15,7 @@ package Automake::Options; -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm index 6a622e639..9f72d2728 100644 --- a/lib/Automake/Rule.pm +++ b/lib/Automake/Rule.pm @@ -15,7 +15,7 @@ package Automake::Rule; -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/lib/Automake/RuleDef.pm b/lib/Automake/RuleDef.pm index e5b3a1b92..1ae8b6332 100644 --- a/lib/Automake/RuleDef.pm +++ b/lib/Automake/RuleDef.pm @@ -15,7 +15,7 @@ package Automake::RuleDef; -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/lib/Automake/VarDef.pm b/lib/Automake/VarDef.pm index 3e139326e..9f09411cc 100644 --- a/lib/Automake/VarDef.pm +++ b/lib/Automake/VarDef.pm @@ -15,7 +15,7 @@ package Automake::VarDef; -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm index cc6b12fe0..2c118314e 100644 --- a/lib/Automake/Variable.pm +++ b/lib/Automake/Variable.pm @@ -15,7 +15,7 @@ package Automake::Variable; -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/lib/Automake/Version.pm b/lib/Automake/Version.pm index 02146a500..369a229e8 100644 --- a/lib/Automake/Version.pm +++ b/lib/Automake/Version.pm @@ -15,7 +15,7 @@ package Automake::Version; -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/lib/Automake/Wrap.pm b/lib/Automake/Wrap.pm index 73a624757..9233798bd 100644 --- a/lib/Automake/Wrap.pm +++ b/lib/Automake/Wrap.pm @@ -15,7 +15,7 @@ package Automake::Wrap; -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; diff --git a/lib/Automake/XFile.pm b/lib/Automake/XFile.pm index fb256c97b..05e8b32a2 100644 --- a/lib/Automake/XFile.pm +++ b/lib/Automake/XFile.pm @@ -69,7 +69,7 @@ and C methods to translate C<\r\n> to C<\n>. =cut -use 5.010; +use 5.006; use strict; use warnings FATAL => 'all'; -- cgit v1.2.1