Skip to content

Commit cf4cc6d

Browse files
PeterMartiniPeterMartini
committed
5.22.1 -> 5.22.2
1 parent 30e529b commit cf4cc6d

File tree

19 files changed

+534
-42
lines changed

19 files changed

+534
-42
lines changed

‎5.008.009-64bit,threaded/DevelPatchPerl.patch‎

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,44 @@
1+
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
2+
index 6f20c5e..684f369 100644
3+
--- a/ext/Errno/Errno_pm.PL
4+
+++ b/ext/Errno/Errno_pm.PL
5+
@@ -253,20 +253,31 @@ sub write_errno_pm {
6+
unless ($^O eq 'MacOS' || $^O eq 'beos') { # trust what we have / get later
7+
# invoke CPP and read the output
8+
9+
+ my $inhibit_linemarkers = '';
10+
+ if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {
11+
+ # GCC 5.0 interleaves expanded macros with line numbers breaking
12+
+ # each line into multiple lines. RT#123784
13+
+ $inhibit_linemarkers = ' -P';
14+
+ }
15+
+
16+
if ($^O eq 'VMS') {
17+
- my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";
18+
+ my $cpp = "$Config{cppstdin} $Config{cppflags}" .
19+
+ $inhibit_linemarkers . " $Config{cppminus}";
20+
$cpp =~ s/sys\$input//i;
21+
open(CPPO,"$cpp errno.c |") or
22+
die "Cannot exec $Config{cppstdin}";
23+
} elsif ($IsMSWin32 || $^O eq 'NetWare') {
24+
- open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or
25+
- die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";
26+
+ my $cpp = "$Config{cpprun} $Config{cppflags}" .
27+
+ $inhibit_linemarkers;
28+
+ open(CPPO,"$cpp errno.c |") or
29+
+ die "Cannot run '$cpp errno.c'";
30+
} elsif ($IsSymbian) {
31+
- my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";
32+
+ my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .
33+
+ $inhibit_linemarkers ." -";
34+
open(CPPO,"$cpp < errno.c |")
35+
or die "Cannot exec $cpp";
36+
} else {
37+
- my $cpp = default_cpp();
38+
+ my $cpp = default_cpp() . $inhibit_linemarkers;
39+
open(CPPO,"$cpp < errno.c |")
40+
or die "Cannot exec $cpp";
41+
}
142
diff --git a/hints/linux.sh b/hints/linux.sh
243
index ac264c3..fb5a46e 100644
344
--- a/hints/linux.sh
@@ -347,14 +388,14 @@ index 030db74..0d15a40 100644
347388
}
348389

349390
diff --git a/patchlevel.h b/patchlevel.h
350-
index 82f11ed..9d98556 100644
391+
index 82f11ed..2254fd1 100644
351392
--- a/patchlevel.h
352393
+++ b/patchlevel.h
353394
@@ -121,6 +121,7 @@ hunk.
354395
#if !defined(PERL_PATCHLEVEL_H_IMPLICIT) && !defined(LOCAL_PATCH_COUNT)
355396
static const char *local_patches[] = {
356397
NULL
357-
+ ,"Devel::PatchPerl 1.32"
398+
+ ,"Devel::PatchPerl 1.38"
358399
,NULL
359400
};
360401

‎5.008.009-64bit/DevelPatchPerl.patch‎

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,44 @@
1+
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
2+
index 6f20c5e..684f369 100644
3+
--- a/ext/Errno/Errno_pm.PL
4+
+++ b/ext/Errno/Errno_pm.PL
5+
@@ -253,20 +253,31 @@ sub write_errno_pm {
6+
unless ($^O eq 'MacOS' || $^O eq 'beos') { # trust what we have / get later
7+
# invoke CPP and read the output
8+
9+
+ my $inhibit_linemarkers = '';
10+
+ if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {
11+
+ # GCC 5.0 interleaves expanded macros with line numbers breaking
12+
+ # each line into multiple lines. RT#123784
13+
+ $inhibit_linemarkers = ' -P';
14+
+ }
15+
+
16+
if ($^O eq 'VMS') {
17+
- my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";
18+
+ my $cpp = "$Config{cppstdin} $Config{cppflags}" .
19+
+ $inhibit_linemarkers . " $Config{cppminus}";
20+
$cpp =~ s/sys\$input//i;
21+
open(CPPO,"$cpp errno.c |") or
22+
die "Cannot exec $Config{cppstdin}";
23+
} elsif ($IsMSWin32 || $^O eq 'NetWare') {
24+
- open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or
25+
- die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";
26+
+ my $cpp = "$Config{cpprun} $Config{cppflags}" .
27+
+ $inhibit_linemarkers;
28+
+ open(CPPO,"$cpp errno.c |") or
29+
+ die "Cannot run '$cpp errno.c'";
30+
} elsif ($IsSymbian) {
31+
- my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";
32+
+ my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .
33+
+ $inhibit_linemarkers ." -";
34+
open(CPPO,"$cpp < errno.c |")
35+
or die "Cannot exec $cpp";
36+
} else {
37+
- my $cpp = default_cpp();
38+
+ my $cpp = default_cpp() . $inhibit_linemarkers;
39+
open(CPPO,"$cpp < errno.c |")
40+
or die "Cannot exec $cpp";
41+
}
142
diff --git a/hints/linux.sh b/hints/linux.sh
243
index ac264c3..fb5a46e 100644
344
--- a/hints/linux.sh
@@ -347,14 +388,14 @@ index 030db74..0d15a40 100644
347388
}
348389

349390
diff --git a/patchlevel.h b/patchlevel.h
350-
index 82f11ed..9d98556 100644
391+
index 82f11ed..2254fd1 100644
351392
--- a/patchlevel.h
352393
+++ b/patchlevel.h
353394
@@ -121,6 +121,7 @@ hunk.
354395
#if !defined(PERL_PATCHLEVEL_H_IMPLICIT) && !defined(LOCAL_PATCH_COUNT)
355396
static const char *local_patches[] = {
356397
NULL
357-
+ ,"Devel::PatchPerl 1.32"
398+
+ ,"Devel::PatchPerl 1.38"
358399
,NULL
359400
};
360401

‎5.010.001-64bit,threaded/DevelPatchPerl.patch‎

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,44 @@
1+
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
2+
index 124b8fc..670fabc 100644
3+
--- a/ext/Errno/Errno_pm.PL
4+
+++ b/ext/Errno/Errno_pm.PL
5+
@@ -257,20 +257,31 @@ sub write_errno_pm {
6+
unless ($^O eq 'MacOS' || $^O eq 'beos') { # trust what we have / get later
7+
# invoke CPP and read the output
8+
9+
+ my $inhibit_linemarkers = '';
10+
+ if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {
11+
+ # GCC 5.0 interleaves expanded macros with line numbers breaking
12+
+ # each line into multiple lines. RT#123784
13+
+ $inhibit_linemarkers = ' -P';
14+
+ }
15+
+
16+
if ($^O eq 'VMS') {
17+
- my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";
18+
+ my $cpp = "$Config{cppstdin} $Config{cppflags}" .
19+
+ $inhibit_linemarkers . " $Config{cppminus}";
20+
$cpp =~ s/sys\$input//i;
21+
open(CPPO,"$cpp errno.c |") or
22+
die "Cannot exec $Config{cppstdin}";
23+
} elsif ($IsMSWin32 || $^O eq 'NetWare') {
24+
- open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or
25+
- die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";
26+
+ my $cpp = "$Config{cpprun} $Config{cppflags}" .
27+
+ $inhibit_linemarkers;
28+
+ open(CPPO,"$cpp errno.c |") or
29+
+ die "Cannot run '$cpp errno.c'";
30+
} elsif ($IsSymbian) {
31+
- my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";
32+
+ my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .
33+
+ $inhibit_linemarkers ." -";
34+
open(CPPO,"$cpp < errno.c |")
35+
or die "Cannot exec $cpp";
36+
} else {
37+
- my $cpp = default_cpp();
38+
+ my $cpp = default_cpp() . $inhibit_linemarkers;
39+
open(CPPO,"$cpp < errno.c |")
40+
or die "Cannot exec $cpp";
41+
}
142
diff --git a/ext/Hash-Util-FieldHash/t/10_hash.t b/ext/Hash-Util-FieldHash/t/10_hash.t
243
index 29c2f4d..c266b6a 100755
344
--- a/ext/Hash-Util-FieldHash/t/10_hash.t
@@ -446,14 +487,14 @@ index 22a97eb..6eac035 100644
446487

447488
# Presumably this can be simplified
448489
diff --git a/patchlevel.h b/patchlevel.h
449-
index 4442407..5169551 100644
490+
index 4442407..b82feab 100644
450491
--- a/patchlevel.h
451492
+++ b/patchlevel.h
452493
@@ -131,6 +131,7 @@ static const char * const local_patches[] = {
453494
NULL
454495
PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */
455496
PERL_GIT_UNCOMMITTED_CHANGES /* do not remove this line */
456-
+ ,"Devel::PatchPerl 1.32"
497+
+ ,"Devel::PatchPerl 1.38"
457498
,NULL
458499
};
459500

‎5.010.001-64bit/DevelPatchPerl.patch‎

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,44 @@
1+
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
2+
index 124b8fc..670fabc 100644
3+
--- a/ext/Errno/Errno_pm.PL
4+
+++ b/ext/Errno/Errno_pm.PL
5+
@@ -257,20 +257,31 @@ sub write_errno_pm {
6+
unless ($^O eq 'MacOS' || $^O eq 'beos') { # trust what we have / get later
7+
# invoke CPP and read the output
8+
9+
+ my $inhibit_linemarkers = '';
10+
+ if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {
11+
+ # GCC 5.0 interleaves expanded macros with line numbers breaking
12+
+ # each line into multiple lines. RT#123784
13+
+ $inhibit_linemarkers = ' -P';
14+
+ }
15+
+
16+
if ($^O eq 'VMS') {
17+
- my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";
18+
+ my $cpp = "$Config{cppstdin} $Config{cppflags}" .
19+
+ $inhibit_linemarkers . " $Config{cppminus}";
20+
$cpp =~ s/sys\$input//i;
21+
open(CPPO,"$cpp errno.c |") or
22+
die "Cannot exec $Config{cppstdin}";
23+
} elsif ($IsMSWin32 || $^O eq 'NetWare') {
24+
- open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or
25+
- die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";
26+
+ my $cpp = "$Config{cpprun} $Config{cppflags}" .
27+
+ $inhibit_linemarkers;
28+
+ open(CPPO,"$cpp errno.c |") or
29+
+ die "Cannot run '$cpp errno.c'";
30+
} elsif ($IsSymbian) {
31+
- my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";
32+
+ my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .
33+
+ $inhibit_linemarkers ." -";
34+
open(CPPO,"$cpp < errno.c |")
35+
or die "Cannot exec $cpp";
36+
} else {
37+
- my $cpp = default_cpp();
38+
+ my $cpp = default_cpp() . $inhibit_linemarkers;
39+
open(CPPO,"$cpp < errno.c |")
40+
or die "Cannot exec $cpp";
41+
}
142
diff --git a/ext/Hash-Util-FieldHash/t/10_hash.t b/ext/Hash-Util-FieldHash/t/10_hash.t
243
index 29c2f4d..c266b6a 100755
344
--- a/ext/Hash-Util-FieldHash/t/10_hash.t
@@ -446,14 +487,14 @@ index 22a97eb..6eac035 100644
446487

447488
# Presumably this can be simplified
448489
diff --git a/patchlevel.h b/patchlevel.h
449-
index 4442407..5169551 100644
490+
index 4442407..b82feab 100644
450491
--- a/patchlevel.h
451492
+++ b/patchlevel.h
452493
@@ -131,6 +131,7 @@ static const char * const local_patches[] = {
453494
NULL
454495
PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */
455496
PERL_GIT_UNCOMMITTED_CHANGES /* do not remove this line */
456-
+ ,"Devel::PatchPerl 1.32"
497+
+ ,"Devel::PatchPerl 1.38"
457498
,NULL
458499
};
459500

‎5.012.005-64bit,threaded/DevelPatchPerl.patch‎

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,47 @@ index e400dda..e25e31a 100755
2323
### warn if we are going to skip long file names
2424
if ($TOO_LONG) {
2525
diag("No long filename support - long filename extraction disabled") if ! $ENV{PERL_CORE};
26+
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
27+
index 124b8fc..670fabc 100644
28+
--- a/ext/Errno/Errno_pm.PL
29+
+++ b/ext/Errno/Errno_pm.PL
30+
@@ -257,20 +257,31 @@ sub write_errno_pm {
31+
unless ($^O eq 'MacOS' || $^O eq 'beos') { # trust what we have / get later
32+
# invoke CPP and read the output
33+
34+
+ my $inhibit_linemarkers = '';
35+
+ if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {
36+
+ # GCC 5.0 interleaves expanded macros with line numbers breaking
37+
+ # each line into multiple lines. RT#123784
38+
+ $inhibit_linemarkers = ' -P';
39+
+ }
40+
+
41+
if ($^O eq 'VMS') {
42+
- my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";
43+
+ my $cpp = "$Config{cppstdin} $Config{cppflags}" .
44+
+ $inhibit_linemarkers . " $Config{cppminus}";
45+
$cpp =~ s/sys\$input//i;
46+
open(CPPO,"$cpp errno.c |") or
47+
die "Cannot exec $Config{cppstdin}";
48+
} elsif ($IsMSWin32 || $^O eq 'NetWare') {
49+
- open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or
50+
- die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";
51+
+ my $cpp = "$Config{cpprun} $Config{cppflags}" .
52+
+ $inhibit_linemarkers;
53+
+ open(CPPO,"$cpp errno.c |") or
54+
+ die "Cannot run '$cpp errno.c'";
55+
} elsif ($IsSymbian) {
56+
- my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";
57+
+ my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .
58+
+ $inhibit_linemarkers ." -";
59+
open(CPPO,"$cpp < errno.c |")
60+
or die "Cannot exec $cpp";
61+
} else {
62+
- my $cpp = default_cpp();
63+
+ my $cpp = default_cpp() . $inhibit_linemarkers;
64+
open(CPPO,"$cpp < errno.c |")
65+
or die "Cannot exec $cpp";
66+
}
2667
diff --git a/ext/Hash-Util-FieldHash/t/10_hash.t b/ext/Hash-Util-FieldHash/t/10_hash.t
2768
index 2cfb4e8..d58f053 100755
2869
--- a/ext/Hash-Util-FieldHash/t/10_hash.t
@@ -432,14 +473,14 @@ index de26d84..52b0492 100644
432473

433474
# Presumably this can be simplified
434475
diff --git a/patchlevel.h b/patchlevel.h
435-
index f1a12bd..61bf49d 100644
476+
index f1a12bd..420296d 100644
436477
--- a/patchlevel.h
437478
+++ b/patchlevel.h
438479
@@ -131,6 +131,7 @@ static const char * const local_patches[] = {
439480
,"uncommitted-changes"
440481
#endif
441482
PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */
442-
+ ,"Devel::PatchPerl 1.32"
483+
+ ,"Devel::PatchPerl 1.38"
443484
,NULL
444485
};
445486

‎5.012.005-64bit/DevelPatchPerl.patch‎

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,47 @@ index e400dda..e25e31a 100755
2323
### warn if we are going to skip long file names
2424
if ($TOO_LONG) {
2525
diag("No long filename support - long filename extraction disabled") if ! $ENV{PERL_CORE};
26+
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
27+
index 124b8fc..670fabc 100644
28+
--- a/ext/Errno/Errno_pm.PL
29+
+++ b/ext/Errno/Errno_pm.PL
30+
@@ -257,20 +257,31 @@ sub write_errno_pm {
31+
unless ($^O eq 'MacOS' || $^O eq 'beos') { # trust what we have / get later
32+
# invoke CPP and read the output
33+
34+
+ my $inhibit_linemarkers = '';
35+
+ if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {
36+
+ # GCC 5.0 interleaves expanded macros with line numbers breaking
37+
+ # each line into multiple lines. RT#123784
38+
+ $inhibit_linemarkers = ' -P';
39+
+ }
40+
+
41+
if ($^O eq 'VMS') {
42+
- my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";
43+
+ my $cpp = "$Config{cppstdin} $Config{cppflags}" .
44+
+ $inhibit_linemarkers . " $Config{cppminus}";
45+
$cpp =~ s/sys\$input//i;
46+
open(CPPO,"$cpp errno.c |") or
47+
die "Cannot exec $Config{cppstdin}";
48+
} elsif ($IsMSWin32 || $^O eq 'NetWare') {
49+
- open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or
50+
- die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";
51+
+ my $cpp = "$Config{cpprun} $Config{cppflags}" .
52+
+ $inhibit_linemarkers;
53+
+ open(CPPO,"$cpp errno.c |") or
54+
+ die "Cannot run '$cpp errno.c'";
55+
} elsif ($IsSymbian) {
56+
- my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";
57+
+ my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .
58+
+ $inhibit_linemarkers ." -";
59+
open(CPPO,"$cpp < errno.c |")
60+
or die "Cannot exec $cpp";
61+
} else {
62+
- my $cpp = default_cpp();
63+
+ my $cpp = default_cpp() . $inhibit_linemarkers;
64+
open(CPPO,"$cpp < errno.c |")
65+
or die "Cannot exec $cpp";
66+
}
2667
diff --git a/ext/Hash-Util-FieldHash/t/10_hash.t b/ext/Hash-Util-FieldHash/t/10_hash.t
2768
index 2cfb4e8..d58f053 100755
2869
--- a/ext/Hash-Util-FieldHash/t/10_hash.t
@@ -432,14 +473,14 @@ index de26d84..52b0492 100644
432473

433474
# Presumably this can be simplified
434475
diff --git a/patchlevel.h b/patchlevel.h
435-
index f1a12bd..61bf49d 100644
476+
index f1a12bd..420296d 100644
436477
--- a/patchlevel.h
437478
+++ b/patchlevel.h
438479
@@ -131,6 +131,7 @@ static const char * const local_patches[] = {
439480
,"uncommitted-changes"
440481
#endif
441482
PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */
442-
+ ,"Devel::PatchPerl 1.32"
483+
+ ,"Devel::PatchPerl 1.38"
443484
,NULL
444485
};
445486

0 commit comments

Comments
 (0)