Skip to content

Commit 190ae7e

Browse files
atoomickhwilliamson
authored andcommitted
Devel-PPPort: Bump to upstream at 7180c297
These changes from Devel-PPPort are adding support for Perl 7.0 and fixes the testsuite with a Perl 7.0.0 binary. We would have to publish a new version of Devel-PPPort.
1 parent 740fde8 commit 190ae7e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1032
-927
lines changed

dist/Devel-PPPort/Changes

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
Revision history for Devel-PPPort
22

3+
3.58 - 2020-03-09
4+
5+
* Safer definition of UVCHR_SKIP
6+
* Make sure WIDEST_UTYPE is unsigned
7+
* Avoid Pax Header in tarballs
8+
39
3.57 - 2020-01-31
410

511
* Fix eval_sv for Perl versions prior to 5.6.0 (Pali)

dist/Devel-PPPort/HACKERS

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -204,20 +204,24 @@ Perl public API.
204204

205205
=item Version numbers
206206

207-
Version checking can be tricky to get correct (besides being buggy in some perl
208-
versions).
209-
C<ivers()> is used in the C<=tests> section to overcome this, and constructs
207+
Version checking used to be tricky to get correct (besides being buggy in some
208+
perl versions).
209+
C<ivers()> is used in the C<=tests> section to overcome this. and constructs
210210
like the following in the C language sections.
211211

212-
#if { VERSION < 5.9.3 }
212+
#if PERL_VERSION_EQ(5,9,3)
213+
#if PERL_VERSION_NE(5,9,3)
214+
#if PERL_VERSION_LT(5,9,3)
215+
#if PERL_VERSION_GT(5,9,3)
216+
#if PERL_VERSION_LE(5,9,3)
217+
#if PERL_VERSION_GE(5,9,3)
213218

214-
instead of
219+
An alternative way of saying things like these is
215220

216-
#if ((PERL_VERSION < 9) \
217-
|| (PERL_VERSION == 9 && PERL_SUBVERSION < 3))
221+
#if { VERSION < 5.9.3 }
218222

219-
The version number can be either of the new form C<5.x.x> or the older
220-
form C<5.00x_yy>. Both are translated into the correct preprocessor
223+
In this form, the version number can be either of the new form C<5.x.x> or the
224+
older form C<5.00x_yy>. Both are translated into the correct preprocessor
221225
statements. It is also possible to combine this with other statements:
222226

223227
#if { VERSION >= 5.004 } && !defined(sv_vcatpvf)
@@ -399,7 +403,7 @@ collect the remaining information in F<parts/apidoc.fnc>.
399403
=item *
400404

401405
The final step before regenerating everything is to run
402-
F</devel/mkppport_fnc.pl> to update the F</parts/ppport.fnc> file.
406+
F<devel/mkppport_fnc.pl> to update the F</parts/ppport.fnc> file.
403407

404408
=back
405409

dist/Devel-PPPort/Makefile.PL

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,8 @@ sub MY::dist_core
219219
if ( $rule =~ m{^\s*^dist\s+:}m ) {
220220
$rule =~ s{:}{: PPPort.pm manifest}; # make sure we update PPPort.pm
221221
$rule .= qq[\t].q[$(NOECHO) $(ECHO) "Warning: Please check '__MAX_PERL__' value in PPPort_pm.PL"].qq[\n];
222+
# checking that the tarball has no Pax Header - avoid false positives by using [P]axHEader
223+
$rule .= qq[\t].q[$(NOECHO) zgrep -a -e '[P]axHeader' $(DISTVNAME).tar$(SUFFIX) && ( $(ECHO) "ERROR: Pax Header detected in tarball"; rm -f $(DISTVNAME).tar$(SUFFIX) ) ||:].qq[\n];
222224
}
223225
$updated .= $rule;
224226
}

dist/Devel-PPPort/PPPort_pm.PL

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ package Devel::PPPort;
711711
use strict;
712712
use vars qw($VERSION $data);
713713
714-
$VERSION = '3.57';
714+
$VERSION = '3.58';
715715
716716
sub _init_data
717717
{
@@ -747,7 +747,7 @@ sub WriteFile
747747
748748
__DATA__
749749
#if 0
750-
<<'SKIP';
750+
my $void = <<'SKIP';
751751
#endif
752752
/*
753753
----------------------------------------------------------------------

dist/Devel-PPPort/devel/mkapidoc.pl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
use strict;
2424

2525
my $PERLROOT = $ARGV[0];
26-
$PERLROOT = '../..' unless $PERLROOT;
26+
unless ($PERLROOT) {
27+
$PERLROOT = '../..';
28+
print STDERR "$0: perl directory root argument not specified. Assuming '$PERLROOT'\n";
29+
}
2730

2831
die "'$PERLROOT' is invalid, or you haven't successfully run 'make' in it"
2932
unless -e "$PERLROOT/warnings.h";

dist/Devel-PPPort/mktests.PL

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ BEGIN {
7878
if ($ENV{'PERL_CORE'}) {
7979
chdir 't' if -d 't';
8080
unshift @INC, '../lib' if -d '../lib' && -d '../ext';
81-
require Config; import Config;
81+
require Config; Config->import;
8282
use vars '%Config';
8383
if (" $Config{'extensions'} " !~ m[ Devel/PPPort ]) {
8484
print "1..0 # Skip -- Perl configured without Devel::PPPort module\n";
@@ -110,7 +110,7 @@ package Devel::PPPort;
110110
use vars '@ISA';
111111
require DynaLoader;
112112
@ISA = qw(DynaLoader);
113-
bootstrap Devel::PPPort;
113+
Devel::PPPort->bootstrap;
114114
115115
package main;
116116

dist/Devel-PPPort/parts/apicheck.pl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,13 @@
339339
# #ifdef out if marked as todo (not known in) this version
340340
if (exists $todo{$f->{'name'}}) {
341341
my($five, $ver,$sub) = parse_version($todo{$f->{'name'}}{'version'});
342-
print OUT "#if PERL_VERSION > $ver || (PERL_VERSION == $ver && PERL_SUBVERSION >= $sub) /* TODO */\n";
342+
print OUT <<EOT;
343+
#if PERL_REVISION > $five \\
344+
|| ( PERL_REVISION == $five \\
345+
&& ( PERL_VERSION > $ver \\
346+
|| ( PERL_VERSION == $ver \\
347+
&& PERL_SUBVERSION >= $sub))) /* TODO */
348+
EOT
343349
}
344350

345351
my $final = $varargs

dist/Devel-PPPort/parts/apidoc.fnc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Amd|void|__ASSERT_|bool expr
2020
Amnhd||aTHX
2121
Amnhd||aTHX_
2222
Amd|int|AvFILL|AV* av
23+
md|int|AvFILLp|AV* av
2324
Amnd|I32|ax
2425
Amxud|void|BhkDISABLE|BHK *hk|which
2526
Amxud|void|BhkENABLE|BHK *hk|which
@@ -583,13 +584,23 @@ AmnUhd||PERL_UQUAD_MIN
583584
AmnUhd||PERL_USHORT_MAX
584585
AmnUhd||PERL_USHORT_MIN
585586
hAmnd|int|PERL_VERSION
587+
AmdR|bool|PERL_VERSION_EQ|const int r|const int v|const int s
588+
AmdR|bool|PERL_VERSION_GE|const int r|const int v|const int s
589+
AmdR|bool|PERL_VERSION_GT|const int r|const int v|const int s
590+
AmdR|bool|PERL_VERSION_LE|const int r|const int v|const int s
591+
AmdR|bool|PERL_VERSION_LT|const int r|const int v|const int s
592+
AmdR|bool|PERL_VERSION_NE|const int r|const int v|const int s
586593
AmnUd|Perl_check_t *|PL_check
587594
AmnxUd|PAD *|PL_comppad
588595
AmnxUd|PADNAMELIST *|PL_comppad_name
589596
Amnd|COP*|PL_curcop
590597
AmnxUd|SV **|PL_curpad
591598
Amnd|HV*|PL_curstash
599+
mnd|SV *|PL_DBsingle
600+
mnd|GV *|PL_DBsub
601+
mnd|SV *|PL_DBtrace
592602
Amnd|GV *|PL_defgv
603+
mnd|U8|PL_dowarn
593604
Amnhd|GV *|PL_errgv
594605
Amnd|U8|PL_exit_flags
595606
AmnUxd|Perl_keyword_plugin_t|PL_keyword_plugin

dist/Devel-PPPort/parts/base/5017006

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
5.017006
2-
croak_memory_wrap # U
32
READ_XDIGIT # U
43
croak_no_mem # F added by devel/scanprov
54
get_and_check_backslash_N_name # F added by devel/scanprov

dist/Devel-PPPort/parts/base/5019003

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
PERL_EXIT_ABORT # E
33
PERL_EXIT_WARN # E
44
sv_pos_b2u_flags # U
5+
croak_memory_wrap # M added by devel/scanprov
56
adjust_size_and_find_bucket # F added by devel/scanprov
67
cv_const_sv_or_av # F added by devel/scanprov
78
_invlist_dump # F added by devel/scanprov

0 commit comments

Comments
 (0)