diff options
Diffstat (limited to 'dev-build/automake')
6 files changed, 643 insertions, 16 deletions
diff --git a/dev-build/automake/Manifest b/dev-build/automake/Manifest index cf8a251624b8..2beeecb36387 100644 --- a/dev-build/automake/Manifest +++ b/dev-build/automake/Manifest @@ -1,12 +1,14 @@ AUX automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch 3016 BLAKE2B 8dbc2ae72f8d687e785be6dde22429305cdbbb2b441a05ad268d5a7f019b087e090d7b93cb5ff033d004a8344fc9056172f1a16bd0bfa98501e1c55cf6933c54 SHA512 0f6c6ee15c895b64742113156f9864396daa6d7680897e4795909c78cb300df0d96c63091a39e901c2d62e76852fcbb49a5be747cb4b381c4346b81c0c570149 -AUX automake-1.11.6-perl-5.16.patch 3555 BLAKE2B 8128b27ade89b12445b02532d9837ff469e6d0e1be3ebab6969d8d68c3a57a27e25ff89db82ed8abf3eff6d392bbd3b91a0b5b6b0827e7eec1279bc5345dc024 SHA512 050d66f3f1b4aed6482a234b32bbdbe231ddea0c9f4fb2ff97e963095ad69a487fd65986189fd659fbe8d8d011f3f866e92e506e653fd832d2adaf3263ed33fc -AUX automake-1.11.6-perl-escape-curly-bracket-r1.patch 1127 BLAKE2B 18664d2af473845f6ae91ab566651a53cbcf16df598adc3812f6d40f774c2c571c20dada4f23193b2b39ddc36c5fe9fea0449f32231540477fbf2260a7052c51 SHA512 25d94503572f70a5f9ab808057ca1ad7080cba89cf98c2b1664da2dc347f8ada1db6a97138a9b3ee12ffa54a37a34307a9fded4c069e1eb20e490556ad4f46d3 +AUX automake-1.11.6-perl-5.16.patch 3331 BLAKE2B 27cc10f114d36b404d15770821a71703958a9d627143118ebcaa062f86117f539879546b11ca28e283097df34674b47787e5969c93c98c4f6685e89c08e437bd SHA512 4d927c2f95f4593fdc499ba52578b047bfbb8dc7305fdfcab679c08dc4a20bb3e06592de840ddaffabb7ad7f6de0fcf9a5829f70399e895a2fece4013981a832 +AUX automake-1.11.6-perl-escape-curly-bracket-r1.patch 974 BLAKE2B db407b9708aec38a5c3ba54c41b5a2fe1007a3100bd31d09d53e888d9834cc5b39d15ef2d1682cf63b8d2ac909017761b3d02b03e69dbe29ad1ce2d42dd1845f SHA512 219cc7fa2a6fa096adbde9fa3ad342a159ac962d8175d4e20c24f626f8cca9879eb76a82c1bc2038e0c2d766a08f5791e040c0c9688356fc20295daa2db00630 AUX automake-1.16.5-apostrophe-in-tests.patch 1695 BLAKE2B e52093f7a19293d727060c1ba0e38f4d551530bfb77aa999dc68e70b3b1b8eee0a67eed3bfb24660af8f424f9d3bfc69998ff66c17a9be15261191dd6fb13b4a SHA512 f6c34a3d70b260c6923cf062fac107d00e04b58b99702f07e142051ed07a8a8a5c7591a49d6893f06d283a1464772252ef69d70d5ae62e049f72c363d7433299 AUX automake-1.16.5-fix-instmany-python.sh-test.patch 676 BLAKE2B b4368612ef22de981e56c633b6993db5bc7fc1c84f9be002018d4dd25c13bbc36ef7378940680b3c73a559100134e2356e7d626cdc24d91497e644e8e27268a1 SHA512 41d0d797cf25f2e080a57f57bee041cc02ea9e0a7f1ee8aa55af112f43e02c58b867d778b79d82b909d13c55ac0326718f1716947c9022e035e4631d7dbe85a0 AUX automake-1.16.5-fix-py-compile-basedir.sh-test.patch 1084 BLAKE2B 12cef1fb8287ae77a180611d8f8bfa18da1e7cb6e473bcc7b55a4b01ee7ee052863ce156820916b08a193d0b1e2c85580bcd68301c3780865c08d5b274f3af0a SHA512 ef9af5b799c0f7341dfeac5358a05dbcc7547e1d98661e37185b3b3d24971c8db690e9ddf0b471db96254c44ff4ce878c7951e5b5afe96942d5ce21f998ba294 AUX automake-1.16.5-parallel-build.patch 2142 BLAKE2B 68f6664b563f07d7d3a4abcee006955f5fab4611834be80ba856a70a1d2a58d848abacfe259c0dbf7b60945d52b8fab90b538d0054145001b8ac446c2d2ea749 SHA512 1128cbd5766658258c164825a49f7cd03362187640102c1f581ecb3d1552408b22677deaf5dd538d1527dbfcac658545d786637c252a595fb81ceb7c10f82492 AUX automake-1.16.5-py3-compile.patch 2517 BLAKE2B 35ba0af05e84c632b1e2b0e68376316b1ae3eb190521243fd02b3a78d9c13c2fd2853e052af214da8a6fc8139745bbf5f55af34ec5d00a39a99623fbc72c57f4 SHA512 50d7c7f36762abc148a692198da437394890f85ff1c2820c03d5120fbb351253b245e47e6e1b0f8a9a4f532f4e92c3e11524a3d24a9626b7eaa6c7f94216990d AUX automake-1.16.5-py312.patch 1102 BLAKE2B 31b63e6945e1c1b731cd27bd3108269baf0fcddc6862b9a06cb3008eb2155fd44f9f602601387785f8b1d50e13881ae1bfa6086acfef11a9b9e34f81d3b916f9 SHA512 c5747b466141d885650932a741499c5140e3d9fa1bcd0343c615672fe4ae107b7d6d3b8b7b3903a7d83faefd82ca3d79cb9f7a1e745d360ec03d89ac0591cd23 +AUX automake-1.17-perl-5.41.patch 886 BLAKE2B 727819afea9811674136dbb88f97051c9b8329ed9798e9b28aa07a5b5496fd511babad22a25b459597621a705f877b3e82bb7cced87c26a37084f3ddcacef22a SHA512 1f69597fd0d58ff8ebdbd9be31b40095b9c24fa4de1d6bb0aa68660b703206bcb140cfdcaa16df388b24de231bf159597cfef5ee1adc3127ddef49c57ca82b3c +AUX automake-1.17-perl-no-werror.patch 9650 BLAKE2B d9e1e5818b20e04e685598a19c5001a742f19792562cf01aa0dcc73ffce59cf4a3f39520cc25d0e47fdcf9b45cea2ef113c4ec98f366aaa5d08a06a6591023f6 SHA512 37c5eb57382ad28ef8dcacf72ae7d0eeb05c98550db981af392b44cd6dc6a2362afa27890a6a47b3d514bed1a72dcb836ffe01d9e4d9fb51b05928ad4fb77092 DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba DIST automake-1.16.5-tests-c99.patch.xz 7176 BLAKE2B 1fa1d3a499bacc5da9ee9d8ea6cb63d9ab91646a708a53d9bb08eef65fe02a6ab34ff95737042348ea7572bd70c6c7467e260d9441239a00c3571d25d73085f0 SHA512 0065b809219257cbce3c6f6f88459b91a5a29272e0027698e06246181357ffe8d5d40057086438f891d821836441a5a96f2568d52dcd3b5acb80e4d4968cbaf9 DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88 @@ -16,5 +18,6 @@ DIST automake-1.17.tar.xz.sig 833 BLAKE2B 4564c7189360c61bde7e16a7c3a52b86084fb1 EBUILD automake-1.11.6-r4.ebuild 2199 BLAKE2B a67c621eaf9127dc64b5eaa8959f9f9db3b4a7ab7baeae044fa33fecdd40f071209165a300713d7591e352213a1525f43c68a809fb5f984cb50f4a82f8b40e67 SHA512 cf276d1f6750321a6b4c23e1fd40f1c3ce8b1ba8dcd8df5787a2bfcc97a8dbbf04f9cd77a8e5774ee9e0cf0cd577b714f243bd365595ec084ac18a116d6a7a2e EBUILD automake-1.16.5-r2.ebuild 4148 BLAKE2B 756ac60fcba15f0cd7f764f22dfb18dae92455b5847d66eb78432d138135adeabea92943c83804db06072e08383f3268f6ad1827348d9a7fc3f43c95072cc19e SHA512 89175ab1e12857157202ae0abca147081d0176a022b5d90f11803c1157e4fb608e9e72a1b9519131837ef656bf7549101b4d7b28e1c3476b99ae11ad5aa44d3d EBUILD automake-1.17-r1.ebuild 3624 BLAKE2B 64dbd6a968da7c4d13f908ca3534a17dcd508c7a11750dfe461a048b92466540636c48825313eca84f4ac7317ef7e376dea065671c8a2a1e091738a7570d8f49 SHA512 185394b5d3c484865700635b84c50d23d146f6c7e122fe5aad2336e95f01f927680ee4ab44dc153eef543bf93c8eaf13615b7688293a75ddcfdd9a90b6f93996 +EBUILD automake-1.17-r2.ebuild 3722 BLAKE2B 599700931bfbdf044065cac2c6eae7d377ed1071bebf0da87c1fdff1fdce0965a946cb284cba41f90a13e64991b82f3d5658fe60cba20bd3a819d98d7e447535 SHA512 a08aed3f5ace656f6ea2cdde808b0fe2388a8c9306a1c96cf2f5a7c565a6181949efa91c4a8a21192b421b81f50a9d1c9d2bba29f9c228dc8d34489de94172c7 EBUILD automake-9999.ebuild 3632 BLAKE2B 0356a18640e5f6b457ab1f2694efb982ecbab7d4b31ad856ac44856439ec8c049a96203261c678e61b69e86ee0f74873232db78f98c65689775ef70eeaff257b SHA512 9936ea3f1aff726bc228e3b9910efa66eea43ba71a8a140456b042429264242267d4ca4e364f7d260446fab234965af5c3882774e878c565f341c1779f5fdfe4 MISC metadata.xml 363 BLAKE2B 7cbff34d075f5fb5d8391bbc978f9236a6aa1903a697fac7bc52bdf98baebf7053ad4fb4231f4d2b327decce840e47fccf11a28411e9cd12647fa5ab7698f0f5 SHA512 c40b7d0d1986ac70deafd644669caa695279b4bba94b2bd5ab9a9dc8c14cb246b83dc6f19811210559fb9e0e85c7703a2599d910c8fe7a31bff01be10f6dfed7 diff --git a/dev-build/automake/automake-1.17-r2.ebuild b/dev-build/automake/automake-1.17-r2.ebuild new file mode 100644 index 000000000000..add36e6de720 --- /dev/null +++ b/dev-build/automake/automake-1.17-r2.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Bumping notes: +# * Remember to modify LAST_KNOWN_AUTOMAKE_VER 'upstream' in dev-build/automake-wrapper +# on new automake (major) releases, as well as the dependency in RDEPEND below too. +# * Update _WANT_AUTOMAKE and _automake_atom case statement in autotools.eclass. + +PYTHON_COMPAT=( python3_{10..13} ) + +inherit python-any-r1 verify-sig + +MANGLED_SLOT=${PV:0:4} + +if [[ ${PV} == 9999 ]] ; then + EGIT_MIN_CLONE_TYPE=single + EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jimmeyering.asc + if [[ $(ver_cut 3) -ge 90 ]] ; then + MANGLED_SLOT=$(ver_cut 1).$(($(ver_cut 2) + 1)) + SRC_URI=" + https://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz + verify-sig? ( + https://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz.sig + ) + " + else + SRC_URI=" + mirror://gnu/${PN}/${P}.tar.xz + verify-sig? ( + mirror://gnu/${PN}/${P}.tar.xz.sig + ) + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi +fi + +DESCRIPTION="Used to generate Makefile.in from Makefile.am" +HOMEPAGE="https://www.gnu.org/software/automake/" + +LICENSE="GPL-2" +# Use Gentoo versioning for slotting. +SLOT="${MANGLED_SLOT}" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-lang/perl-5.6 + >=dev-build/automake-wrapper-20240607 + >=dev-build/autoconf-2.69:* + sys-devel/gnuconfig +" +BDEPEND=" + app-alternatives/gzip + sys-apps/help2man + dev-build/autoconf-wrapper + dev-build/autoconf + test? ( + ${PYTHON_DEPS} + dev-util/dejagnu + sys-devel/bison + sys-devel/flex + ) + verify-sig? ( sec-keys/openpgp-keys-jimmeyering ) +" + +PATCHES=( + "${FILESDIR}"/${P}-perl-5.41.patch + "${FILESDIR}"/${P}-perl-no-werror.patch +) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + + export WANT_AUTOCONF=2.5 + # Don't try wrapping the autotools - this thing runs as it tends + # to be a bit esoteric, and the script does `set -e` itself. + ./bootstrap || die + sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die + + # bug #628912 + if ! has_version -b sys-apps/texinfo ; then + touch doc/{stamp-vti,version.texi,automake.info} || die + fi +} + +src_configure() { + # Also used in install. + infopath="${EPREFIX}/usr/share/automake-${PV}/info" + econf --infodir="${infopath}" +} + +src_test() { + # Fails with byacc/flex + emake YACC="bison -y" LEX="flex" check +} + +src_install() { + default + + rm "${ED}"/usr/share/aclocal/README || die + rmdir "${ED}"/usr/share/aclocal || die + rm \ + "${ED}"/usr/bin/{aclocal,automake} \ + "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die + + # remove all config.guess and config.sub files replacing them + # w/a symlink to a specific gnuconfig version + local x + for x in guess sub ; do + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} + done + + # Avoid QA message about pre-compressed file in docs + local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi + + pushd "${D}/${infopath}" >/dev/null || die + for f in *.info*; do + # Install convenience aliases for versioned Automake pages. + ln -s "$f" "${f/./-${PV}.}" || die + done + popd >/dev/null || die + + if [[ ${PV} == 9999 ]]; then + local major="89" + local minor="999" + else + local major="$(ver_cut 1)" + if [[ $(ver_cut 3) -ge 90 ]] ; then + local minor=$(($(ver_cut 2) + 1)) + else + local minor="$(ver_cut 2)" + fi + fi + local idx="$((99999-(major*1000+minor)))" + newenvd - "06automake${idx}" <<-EOF + INFOPATH="${infopath}" + EOF + + docompress "${infopath}" +} diff --git a/dev-build/automake/files/automake-1.11.6-perl-5.16.patch b/dev-build/automake/files/automake-1.11.6-perl-5.16.patch index 19fe249e0c00..b35fb39a3fed 100644 --- a/dev-build/automake/files/automake-1.11.6-perl-5.16.patch +++ b/dev-build/automake/files/automake-1.11.6-perl-5.16.patch @@ -17,14 +17,6 @@ instead of "&func(ARGS...)"). * THANKS, NEWS: Update. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> ---- - NEWS | 4 ++++ - THANKS | 1 + - aclocal.in | 42 ++++++++++++++++++++++++++++++++++-------- - 3 files changed, 39 insertions(+), 8 deletions(-) - -diff --git a/aclocal.in b/aclocal.in -index dfb851b..e8855d5 100644 --- a/aclocal.in +++ b/aclocal.in @@ -152,8 +152,34 @@ my $erase_me; diff --git a/dev-build/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch b/dev-build/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch index bf8819adcf4c..4bd7ab16fb33 100644 --- a/dev-build/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch +++ b/dev-build/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch @@ -15,12 +15,6 @@ https://bugzilla.redhat.com/1239379 * bin/automake.in (substitute_ac_subst_variables): Escape the occurrence of '{' character. ---- - bin/automake.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bin/automake.in b/bin/automake.in -index 0c29184..c294ced 100644 --- a/automake.in +++ b/automake.in @@ -3898,7 +3898,7 @@ sub substitute_ac_subst_variables_worker diff --git a/dev-build/automake/files/automake-1.17-perl-5.41.patch b/dev-build/automake/files/automake-1.17-perl-5.41.patch new file mode 100644 index 000000000000..425ce723e14d --- /dev/null +++ b/dev-build/automake/files/automake-1.17-perl-5.41.patch @@ -0,0 +1,25 @@ +https://git.savannah.gnu.org/cgit/automake.git/commit/?id=b5403ee7a035872a21135c2ee4871a6c284c91dd + +From b5403ee7a035872a21135c2ee4871a6c284c91dd Mon Sep 17 00:00:00 2001 +From: Collin Funk <collin.funk1@gmail.com> +Date: Thu, 30 Jan 2025 15:34:52 -0800 +Subject: automake: avoid precedence error when using Perl 5.41+. + +Reported by Igor Todorovski <itodorov@ca.ibm.com> in +<https://lists.gnu.org/archive/html/automake/2025-01/msg00000.html>. + +* bin/automake.in (transform): Parentheses the '!' operators so +Perl 5.41.8 doesn't warn about "possible precedence problem". +--- a/bin/automake.in ++++ b/bin/automake.in +@@ -6871,7 +6871,7 @@ sub transform ($\%) + { + my $neg = ($1 eq '!') ? 1 : 0; + my $val = transform_token ($token, %$transform, $2); +- return (!!$val == $neg) ? '##%' : ''; ++ return ((!!$val) == $neg) ? '##%' : ''; + } + else + { +-- +cgit v1.1 diff --git a/dev-build/automake/files/automake-1.17-perl-no-werror.patch b/dev-build/automake/files/automake-1.17-perl-no-werror.patch new file mode 100644 index 000000000000..ff0fb790144f --- /dev/null +++ b/dev-build/automake/files/automake-1.17-perl-no-werror.patch @@ -0,0 +1,460 @@ +https://git.savannah.gnu.org/cgit/automake.git/commit/?id=fc1c3f658517be4fe70bdf33bc6cd594d3faa0b2 + +From fc1c3f658517be4fe70bdf33bc6cd594d3faa0b2 Mon Sep 17 00:00:00 2001 +From: Karl Berry <karl@freefriends.org> +Date: Fri, 31 Jan 2025 09:20:47 -0800 +Subject: automake: just use warnings, with no => FATAL. + +Per Perl recommendation: + https://perldoc.perl.org/warnings#Fatal-Warnings +Suggested by Collin Funk: + https://lists.gnu.org/archive/html/automake/2025-01/msg00003.html +And in the Perl discussion: + https://github.com/Perl/perl5/issues/22954#issuecomment-2622966302 + +* bin/aclocal.in: just use warnings, not making them fatal. +* bin/automake.in: +* contrib/tap-driver.pl: +* gen-testsuite-part: +* lib/Automake/ChannelDefs.pm: +* lib/Automake/Channels.pm: +* lib/Automake/Condition.pm: +* lib/Automake/Config.in: +* lib/Automake/Configure_ac.pm: +* lib/Automake/DisjConditions.pm: +* lib/Automake/FileUtils.pm: +* lib/Automake/General.pm: +* lib/Automake/Getopt.pm: +* lib/Automake/Item.pm: +* lib/Automake/ItemDef.pm: +* lib/Automake/Language.pm: +* lib/Automake/Location.pm: +* lib/Automake/Options.pm: +* lib/Automake/Rule.pm: +* lib/Automake/RuleDef.pm: +* lib/Automake/VarDef.pm: +* lib/Automake/Variable.pm: +* lib/Automake/Version.pm: +* lib/Automake/Wrap.pm: +* lib/Automake/XFile.pm: +* t/ax/deltree.pl: +* t/ax/extract-testsuite-summary.pl: +* t/check-fd-redirect.sh: +* t/tap-signal.tap: +* t/tests-environment-fd-redirect.sh: +* t/testsuite-summary-count-many.sh: +--- a/bin/aclocal.in ++++ b/bin/aclocal.in +@@ -19,9 +19,7 @@ + # Written by Tom Tromey <tromey@redhat.com>, and + # Alexandre Duret-Lutz <adl@gnu.org>. + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + BEGIN + { +--- a/bin/automake.in ++++ b/bin/automake.in +@@ -22,9 +22,7 @@ + + package Automake; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + BEGIN + { +--- a/contrib/tap-driver.pl ++++ b/contrib/tap-driver.pl +@@ -27,12 +27,12 @@ + # Imports, static data, and setup. # + # ---------------------------------- # + +-use warnings FATAL => 'all'; +-use strict; ++use strict; use warnings; + use Getopt::Long (); ++ + use TAP::Parser; + +-my $VERSION = '2013-12-24.15'; # UTC ++my $VERSION = '2024-12-03.03'; # UTC + + my $ME = "tap-driver.pl"; + +--- a/gen-testsuite-part ++++ b/gen-testsuite-part +@@ -20,8 +20,8 @@ + + #-------------------------------------------------------------------------- + +-use warnings FATAL => "all"; + use strict; ++use warnings; + use File::Basename (); + use constant TRUE => 1; + use constant FALSE => 0; +--- a/lib/Automake/ChannelDefs.pm ++++ b/lib/Automake/ChannelDefs.pm +@@ -49,10 +49,7 @@ shorthand function to output on specific channels. + + =cut + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Exporter; + + use Automake::Channels; +--- a/lib/Automake/Channels.pm ++++ b/lib/Automake/Channels.pm +@@ -66,10 +66,7 @@ etc.) that can also be overridden on a per-message basis. + + =cut + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Carp; + use Exporter; + use File::Basename; +--- a/lib/Automake/Condition.pm ++++ b/lib/Automake/Condition.pm +@@ -15,10 +15,7 @@ + + package Automake::Condition; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Carp; + use Exporter; + +--- a/lib/Automake/Config.in ++++ b/lib/Automake/Config.in +@@ -17,9 +17,7 @@ + + package Automake::Config; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + use Exporter; + +--- a/lib/Automake/Configure_ac.pm ++++ b/lib/Automake/Configure_ac.pm +@@ -20,9 +20,7 @@ + + package Automake::Configure_ac; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + use Exporter; + +--- a/lib/Automake/DisjConditions.pm ++++ b/lib/Automake/DisjConditions.pm +@@ -15,9 +15,7 @@ + + package Automake::DisjConditions; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + use Carp; + use Automake::Condition qw (TRUE FALSE); +--- a/lib/Automake/FileUtils.pm ++++ b/lib/Automake/FileUtils.pm +@@ -34,9 +34,7 @@ This perl module provides various general purpose file handling functions. + + =cut + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + BEGIN + { +--- a/lib/Automake/General.pm ++++ b/lib/Automake/General.pm +@@ -15,9 +15,7 @@ + + package Automake::General; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + use Exporter; + use File::Basename; +--- a/lib/Automake/Getopt.pm ++++ b/lib/Automake/Getopt.pm +@@ -35,9 +35,7 @@ line options in conformance to the GNU Coding standards. + + =cut + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + use Carp qw (confess croak); + use Exporter (); +--- a/lib/Automake/Item.pm ++++ b/lib/Automake/Item.pm +@@ -15,9 +15,7 @@ + + package Automake::Item; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + use Carp; + +--- a/lib/Automake/ItemDef.pm ++++ b/lib/Automake/ItemDef.pm +@@ -15,10 +15,7 @@ + + package Automake::ItemDef; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Carp; + + =head1 NAME +--- a/lib/Automake/Language.pm ++++ b/lib/Automake/Language.pm +@@ -15,9 +15,7 @@ + + package Automake::Language; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + use Class::Struct (); + +--- a/lib/Automake/Location.pm ++++ b/lib/Automake/Location.pm +@@ -15,9 +15,7 @@ + + package Automake::Location; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + =head1 NAME + +--- a/lib/Automake/Options.pm ++++ b/lib/Automake/Options.pm +@@ -15,10 +15,7 @@ + + package Automake::Options; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Exporter; + + use Automake::Config; +--- a/lib/Automake/Rule.pm ++++ b/lib/Automake/Rule.pm +@@ -15,10 +15,7 @@ + + package Automake::Rule; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Carp; + use Exporter; + +--- a/lib/Automake/RuleDef.pm ++++ b/lib/Automake/RuleDef.pm +@@ -15,10 +15,7 @@ + + package Automake::RuleDef; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Carp; + use Exporter; + +--- a/lib/Automake/VarDef.pm ++++ b/lib/Automake/VarDef.pm +@@ -15,10 +15,7 @@ + + package Automake::VarDef; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Carp; + use Exporter; + +--- a/lib/Automake/Variable.pm ++++ b/lib/Automake/Variable.pm +@@ -15,10 +15,7 @@ + + package Automake::Variable; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Carp; + use Exporter; + +--- a/lib/Automake/Version.pm ++++ b/lib/Automake/Version.pm +@@ -15,9 +15,7 @@ + + package Automake::Version; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; ++use 5.006; use strict; use warnings; + + use Automake::ChannelDefs; + +--- a/lib/Automake/Wrap.pm ++++ b/lib/Automake/Wrap.pm +@@ -15,10 +15,7 @@ + + package Automake::Wrap; + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Exporter; + + our @ISA = qw (Exporter); +--- a/lib/Automake/XFile.pm ++++ b/lib/Automake/XFile.pm +@@ -69,10 +69,7 @@ and C<getlines> methods to translate C<\r\n> to C<\n>. + + =cut + +-use 5.006; +-use strict; +-use warnings FATAL => 'all'; +- ++use 5.006; use strict; use warnings; + use Errno; + use Exporter; + use IO::File; +--- a/t/ax/deltree.pl ++++ b/t/ax/deltree.pl +@@ -17,8 +17,7 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <https://www.gnu.org/licenses/>. + +-use strict; +-use warnings FATAL => 'all'; ++use strict; use warnings; + use File::Path qw/rmtree/; + + my $exit_status = 0; +--- a/t/ax/extract-testsuite-summary.pl ++++ b/t/ax/extract-testsuite-summary.pl +@@ -17,8 +17,7 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <https://www.gnu.org/licenses/>. + +-use warnings FATAL => 'all'; +-use strict; ++use strict; use warnings; + + my $br = '=' x 76; + my @sections = (''); +--- a/t/check-fd-redirect.sh ++++ b/t/check-fd-redirect.sh +@@ -81,8 +81,7 @@ do_check + + echo "#! $PERL -w" > foo.test + cat >> foo.test <<'END' +-use warnings FATAL => 'all'; +-use strict; ++use strict; use warnings; + + open (FD3, "<&=3") or die "opening FD3: $!"; + open (FD4, ">&=4") or die "opening FD4: $!"; +--- a/t/tap-signal.tap ++++ b/t/tap-signal.tap +@@ -52,7 +52,7 @@ for sig in $all_signals; do + # We need autoflush to avoid losing output, which could cause spurious + # "no test plan seen" in the TAP driver. + BEGIN { $| = 1 } +- use warnings FATAL => "all"; ++ use warnings; + print "1..1\\n"; + print "ok 1\\n"; + kill $sig, \$\$; +--- a/t/tests-environment-fd-redirect.sh ++++ b/t/tests-environment-fd-redirect.sh +@@ -44,8 +44,8 @@ END + + echo "#! $PERL -w" > bar.test + cat >>bar.test <<'END' +-use warnings FATAL => 'all'; + use strict; ++use warnings; + open(FD8, ">&=8") or die "$!"; + open(FD9, ">&=9") or die "$!"; + print FD8 " $0: 8888\n"; +--- a/t/testsuite-summary-count-many.sh ++++ b/t/testsuite-summary-count-many.sh +@@ -52,8 +52,8 @@ END + chmod a+x all.test + + $PERL -w -e ' +- use warnings FATAL => "all"; + use strict; ++ use warnings; + + my $base = 1000; + my %count = ( +-- +cgit v1.1 + + |