Skip to content
This repository was archived by the owner on Jun 1, 2023. It is now read-only.

Commit 69b304d

Browse files
author
Reini Urban
committed
EUMM: skip cperl builtin prereqs
1 parent e0581d5 commit 69b304d

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ our %macro_dep; # whether a macro is a dependency
2929
use constant SILENT => (defined $ENV{MAKEFLAGS}
3030
and $ENV{MAKEFLAGS} =~ /\b(s|silent|quiet)\b/) ? 1 : 0;
3131

32-
our $VERSION = '8.04_03';
32+
our $VERSION = '8.04_04';
3333
$VERSION = eval $VERSION; ## no critic [BuiltinFunctions::ProhibitStringyEval]
3434

3535
# Emulate something resembling CVS $Revision$
@@ -517,6 +517,11 @@ END
517517
$installed_file = $prereq;
518518
$pr_version = $];
519519
}
520+
elsif ($Config::Config{usecperl}
521+
and $prereq =~ /^(DynaLoader|XSLoader|strict|coretypes)$/) {
522+
$pr_version = $required_version + 1000;
523+
$installed_file = $prereq;
524+
}
520525
else {
521526
$installed_file = MM->_installed_file_for_module($prereq);
522527
$pr_version = $installed_file ? MM->parse_version($installed_file) : 'undef';

dist/Module-CoreList/lib/Module/CoreList.pm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13363,6 +13363,7 @@ for my $version ( sort { version_sort($a, $b) } keys %released ) {
1336313363
'ExtUtils::Liblist::Kid'=> '8.04_06',
1336413364
'IO::Socket::IP' => '0.38',
1336513365
'ExtUtils::Command::MM' => '8.04_04',
13366+
'ExtUtils::MakeMaker' => '8.04_04',
1336613367
'Storable' => '3.01c',
1336713368
'Term::ReadKey' => '2.37_01',
1336813369
'Thread::Semaphore' => '2.13',

pod/perlcdelta.pod

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ fixed UTF-8 issues, passes now all Test-CPAN-Meta tests.
160160
=item CPAN 2.14c
161161

162162
reapply most of our patches.
163+
skip cperl builtin prereqs.
163164

164165
=item Archive::Tar 2.10
165166

@@ -233,6 +234,10 @@ Reinstate the &DB::sub setter, but no UTF8 support yet.
233234
one more darwin fix for the wrong no library found warning
234235
for symlinked darwin libSystem.dylib libraries.
235236

237+
=item ExtUtils::MakeMaker 8.04_04
238+
239+
skip cperl builtin prereqs.
240+
236241
=item IO::Socket::IP 0.38
237242

238243
protect sv in END during global destruction, esp. with B::C.

t/porting/customized.dat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
B::C cpan/B-C/t/test10 0b3ab672868ee49e8539649aad1ad8c940c4c420
22
CPAN cpan/CPAN/lib/CPAN.pm 3c18561fe8a6947135c5208d968890b41e1b0dc3
3-
CPAN cpan/CPAN/lib/CPAN/Distribution.pm 6aecd5eb65cd65fc49019a8283cf6d6131971cf5
3+
CPAN cpan/CPAN/lib/CPAN/Distribution.pm 01be7d5e0ed091be0f9db7ee562cca0b4670bf49
44
CPAN cpan/CPAN/lib/CPAN/FirstTime.pm bc6f59c30cf7dbb7180270d673c3b152ea93f6c2
55
CPAN cpan/CPAN/lib/CPAN/Version.pm 4f70abb999f1dba524ffd66ee8ac055cd335e1b8
66
CPAN::Meta cpan/CPAN-Meta/lib/CPAN/Meta.pm 5e1d1466cbdb58d00e3a94661d2871f41efc4761
@@ -46,7 +46,7 @@ ExtUtils::CBuilder dist/ExtUtils-CBuilder/t/00-have-compiler.t b65ce65850ad1b887
4646
ExtUtils::CBuilder dist/ExtUtils-CBuilder/t/03-cplusplus.t c01ba6e7a872c8a7fc26e277e0dea109616a5e56
4747
ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm 92397ec3b85c35edd33cbe7b237d244ea2bd00b1
4848
ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm 31719e78e0a0b2c8449a20bb8d3b40b1605a211a
49-
ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm d88649ead5abb549df286334a035af924cc2befa
49+
ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 69351c5e5418046f9800b0d78cf454f5c1931e2d
5050
ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm d79b98465a632dc3bde76a0210d01014d2257dc6
5151
ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 62b0abc38e8c8734fade49c5e63477fe9fc0ea05
5252
ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 9b0e03ff7966e8dfc3daeaf67e7b83c427ab1ba9
@@ -63,7 +63,7 @@ File::Path cpan/File-Path/t/Path_win32.t 94b9276557ce7f80b91f6fd9bfa7a0cd9bf9683
6363
File::Spec dist/PathTools/t/rel2abs_vs_symlink.t abbf1a890a1b6fefebc0c8a9e2849694ade89fa9
6464
IO::Socket::IP cpan/IO-Socket-IP/lib/IO/Socket/IP.pm fb1175286262913bec59482b84a3587ec48339ea
6565
JSON::PP cpan/JSON-PP/lib/JSON/PP.pm da7db2b7b06467019466d3d82f29bfdb6c5b0b49
66-
Module::CoreList dist/Module-CoreList/lib/Module/CoreList.pm 626fb1c196a9e5491df86c348f3b91d0894bdd93
66+
Module::CoreList dist/Module-CoreList/lib/Module/CoreList.pm c72ff468034e511055d5cbc5c552d0b224e12f9c
6767
Module::CoreList dist/Module-CoreList/lib/Module/CoreList/Utils.pm c968b0977900360ef0cf739ee9f9c6be6ce91afc
6868
Module::Metadata cpan/Module-Metadata/t/lib/GeneratePackage.pm 502ffbe2609947430e6aa1a3df8064b3fef3e086
6969
Net::Domain cpan/libnet/lib/Net/Cmd.pm 70a007c38833667ad47ea8059c37c1b7d1c77b6c

0 commit comments

Comments
 (0)