From df4abfca1f7e54ea02a2503bb42775cd1e879f5b Mon Sep 17 00:00:00 2001 From: Chris 'BinGOs' Williams Date: Sat, 2 Nov 2013 23:01:02 +0000 Subject: [PATCH] Update Compress-Raw-Zlib to CPAN version 2.063 [DELTA] 2.063 23 October 2013 * gcc -g3: final link failed: Memory exhausted [#88936] * Compress::Raw::Zlib uses AutoLoader for no reason [#88260] * Typo in Compress::Zlib _combine function documentation [#89305] --- Porting/Maintainers.pl | 2 +- cpan/Compress-Raw-Zlib/Makefile.PL | 8 +++++++- cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm | 5 +---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 816bd52..3af48ff 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -219,7 +219,7 @@ use File::Glob qw(:case); }, 'Compress::Raw::Zlib' => { - 'DISTRIBUTION' => 'PMQS/Compress-Raw-Zlib-2.062.tar.gz', + 'DISTRIBUTION' => 'PMQS/Compress-Raw-Zlib-2.063.tar.gz', 'FILES' => q[cpan/Compress-Raw-Zlib], 'EXCLUDED' => [ diff --git a/cpan/Compress-Raw-Zlib/Makefile.PL b/cpan/Compress-Raw-Zlib/Makefile.PL index d8c060d..aba7abc 100644 --- a/cpan/Compress-Raw-Zlib/Makefile.PL +++ b/cpan/Compress-Raw-Zlib/Makefile.PL @@ -6,6 +6,7 @@ require 5.006 ; use private::MakeUtil; use ExtUtils::MakeMaker 5.16 ; use ExtUtils::Install (); # only needed to check for version +use Config; my $ZLIB_LIB ; my $ZLIB_INCLUDE ; @@ -14,6 +15,10 @@ my $OLD_ZLIB = '' ; my $WALL = '' ; my $GZIP_OS_CODE = -1 ; my $USE_PPPORT_H = ($ENV{PERL_CORE}) ? '' : '-DUSE_PPPORT_H'; +my $OPTIMIZE = $Config{'optimize'}; +if ($Config{'gccversion'} and $OPTIMIZE =~ /-g3/) { + $OPTIMIZE =~ s/-g3/-g/; # [88936] out of memory with -g3 since 2.062 +} #$WALL = ' -pedantic ' if $Config{'cc'} =~ /gcc/ ; #$WALL = ' -Wall -Wno-comment ' if $Config{'cc'} =~ /gcc/ ; @@ -81,7 +86,8 @@ WriteMakefile( ? zlib_files($ZLIB_LIB) : (LIBS => [ "-L$ZLIB_LIB -lz " ]) ), - + OPTIMIZE => $OPTIMIZE, + INSTALLDIRS => ($] >= 5.009 && $] < 5.011 ? 'perl' : 'site'), META_MERGE => { diff --git a/cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm b/cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm index e72be0a..0c5366a 100644 --- a/cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm +++ b/cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm @@ -3,7 +3,6 @@ package Compress::Raw::Zlib; require 5.006 ; require Exporter; -use AutoLoader; use Carp ; use strict ; @@ -11,7 +10,7 @@ use warnings ; use bytes ; our ($VERSION, $XS_VERSION, @ISA, @EXPORT, %EXPORT_TAGS, @EXPORT_OK, $AUTOLOAD, %DEFLATE_CONSTANTS, @DEFLATE_CONSTANTS ); -$VERSION = '2.062'; +$VERSION = '2.063'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; @@ -593,8 +592,6 @@ sub Compress::Raw::Zlib::deflateStream::deflateParams } -# Autoload methods go after __END__, and are processed by the autosplit program. - 1; __END__ -- 2.7.4