You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by km...@apache.org on 2015/03/10 21:28:44 UTC
svn commit: r1665679 - /spamassassin/trunk/Makefile.PL
Author: kmcgrail
Date: Tue Mar 10 20:28:44 2015
New Revision: 1665679
URL: http://svn.apache.org/r1665679
Log:
use eval instead of regex to fix MakeMaker version - bug 7143
Modified:
spamassassin/trunk/Makefile.PL
Modified: spamassassin/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/Makefile.PL?rev=1665679&r1=1665678&r2=1665679&view=diff
==============================================================================
--- spamassassin/trunk/Makefile.PL (original)
+++ spamassassin/trunk/Makefile.PL Tue Mar 10 20:28:44 2015
@@ -7,13 +7,8 @@ use Config;
use ExtUtils::MakeMaker;
-# Store the version for later use
-my $mm_version = $ExtUtils::MakeMaker::VERSION;
-
# avoid stupid 'Argument "6.30_01" isn't numeric in numeric ge (>=)' warnings;
-# strip off the beta subversion noise that causes the trouble.
-$mm_version =~ s/_\S+$//; # "6.30_01" => "6.30"
-$mm_version += 0;
+my $mm_version = eval $ExtUtils::MakeMaker::VERSION;
if ($mm_version < 6.17) {
die "SpamAssassin Makefile.PL requires at least ExtUtils::MakeMaker v6.17";