diff options
| author | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2014-02-03 20:35:24 +0000 |
|---|---|---|
| committer | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2014-02-03 20:35:24 +0000 |
| commit | a69492f5afa4bfb964605fd3f43c40392775c759 (patch) | |
| tree | f18bb25bec5983042bc08ab96434c68b445c91e1 | |
| parent | 95f34b6fc646073944e61496c615de11b8bca7da (diff) | |
| download | perl-a69492f5afa4bfb964605fd3f43c40392775c759.tar.gz | |
Update Compress-Raw-Zlib to CPAN version 2.065
[DELTA]
2.065 3 February 2014
* [PATCH] resolve c++ build failure in core
[#92657]
* gcc -g3: final link failed: Memory exhausted
[#88936]
| -rwxr-xr-x | Porting/Maintainers.pl | 4 | ||||
| -rw-r--r-- | cpan/Compress-Raw-Zlib/Makefile.PL | 4 | ||||
| -rw-r--r-- | cpan/Compress-Raw-Zlib/Zlib.xs | 2 | ||||
| -rw-r--r-- | cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm | 2 | ||||
| -rw-r--r-- | t/porting/customized.dat | 1 |
5 files changed, 5 insertions, 8 deletions
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 201ec8a11b..87821f6ce7 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -220,7 +220,7 @@ use File::Glob qw(:case); }, 'Compress::Raw::Zlib' => { - 'DISTRIBUTION' => 'PMQS/Compress-Raw-Zlib-2.064.tar.gz', + 'DISTRIBUTION' => 'PMQS/Compress-Raw-Zlib-2.065.tar.gz', 'FILES' => q[cpan/Compress-Raw-Zlib], 'EXCLUDED' => [ @@ -230,8 +230,6 @@ use File::Glob qw(:case); t/99pod.t ), ], - # Waiting to be merged upstream; see CPAN RT#92657 - 'CUSTOMIZED' => ['Zlib.xs'], }, 'Config::Perl::V' => { diff --git a/cpan/Compress-Raw-Zlib/Makefile.PL b/cpan/Compress-Raw-Zlib/Makefile.PL index aba7abcb39..015c1d9a13 100644 --- a/cpan/Compress-Raw-Zlib/Makefile.PL +++ b/cpan/Compress-Raw-Zlib/Makefile.PL @@ -16,8 +16,8 @@ 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 +if ($Config{'gccversion'} and $OPTIMIZE =~ /-g (gdb)? 3/x) { + $OPTIMIZE =~ s/-g(gdb)?3/-g/g; # [88936] out of memory with -g3 since 2.062 } #$WALL = ' -pedantic ' if $Config{'cc'} =~ /gcc/ ; diff --git a/cpan/Compress-Raw-Zlib/Zlib.xs b/cpan/Compress-Raw-Zlib/Zlib.xs index e1f2a1f17d..46d4af341b 100644 --- a/cpan/Compress-Raw-Zlib/Zlib.xs +++ b/cpan/Compress-Raw-Zlib/Zlib.xs @@ -1450,7 +1450,7 @@ Perl_sv_dump(output); */ if (RETVAL == Z_NEED_DICT && s->dictionary) { STRLEN dlen; - const Bytef* b = (Bytef*) SvPV(s->dictionary, dlen) ; + const Bytef* b = (const Bytef*)SvPV(s->dictionary, dlen) ; s->dict_adler = s->stream.adler ; RETVAL = inflateSetDictionary(&(s->stream), b, dlen); diff --git a/cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm b/cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm index 11d12bc7c7..ae711285c0 100644 --- a/cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm +++ b/cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm @@ -10,7 +10,7 @@ use warnings ; use bytes ; our ($VERSION, $XS_VERSION, @ISA, @EXPORT, %EXPORT_TAGS, @EXPORT_OK, $AUTOLOAD, %DEFLATE_CONSTANTS, @DEFLATE_CONSTANTS); -$VERSION = '2.064'; +$VERSION = '2.065'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; diff --git a/t/porting/customized.dat b/t/porting/customized.dat index 3e699df130..24639b01c4 100644 --- a/t/porting/customized.dat +++ b/t/porting/customized.dat @@ -1,4 +1,3 @@ -Compress::Raw::Zlib cpan/Compress-Raw-Zlib/Zlib.xs 6659d36455ef430e06a9e6344d4b68b91e71f9ed Config::Perl::V cpan/Config-Perl-V/t/20_plv510.t 7263a40dcbaf1ee447f0209d3bbc029cc747c959 Config::Perl::V cpan/Config-Perl-V/t/21_plv518.t ec23f4e34fb2f84f63f5588ad4a577530dbef5d2 Digest::MD5 cpan/Digest-MD5/t/files.t bdbe05b705d9da305fedce7a9f4b6ba63250c7cf |