From b2cb17719c9233fbc9040ced04418be051c91c14 Mon Sep 17 00:00:00 2001 From: Sawyer X <xsawyerx@cpan.org> Date: Fri, 27 Apr 2018 20:35:42 +0300 Subject: Storable: fix for strawberry build failures: Provided by Graham @haarg Knop. Origin: upstream, https://perl5.git.perl.org/perl.git/commit/3f4cad1bbe7c6238adba5abb2415775a74eded4d Patch-Name: fixes/storable-probing/prereq1.diff --- dist/Storable/Makefile.PL | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dist/Storable/Makefile.PL b/dist/Storable/Makefile.PL index 697750566..4f0213277 100644 --- a/dist/Storable/Makefile.PL +++ b/dist/Storable/Makefile.PL @@ -14,10 +14,12 @@ use File::Spec; unlink "lib/Storable/Limit.pm"; +my $limit_pm = File::Spec->catfile('lib', 'Storable', 'Limit.pm'); + my $pm = { 'Storable.pm' => '$(INST_ARCHLIB)/Storable.pm' }; unless ($ENV{PERL_CORE}) { # the core Makefile takes care of this for core builds - $pm->{"lib/Storable/Limit.pm"} = '$(INST_ARCHLIB)/Storable/Limit.pm'; + $pm->{$limit_pm} = '$(INST_ARCHLIB)/Storable/Limit.pm'; } WriteMakefile( @@ -91,7 +93,6 @@ sub depend { $extra_deps = ' Storable.pm'; } my $linktype = uc($_[0]->{LINKTYPE}); - my $limit_pm = File::Spec->catfile('lib', 'Storable', 'Limit.pm'); " $limit_pm : stacksize \$(INST_$linktype)$extra_deps \$(MKPATH) \$(INST_LIB) @@ -111,7 +112,7 @@ sub test { my $out = $self->SUPER::test(%attr); if ($ENV{PERL_CORE}) { - $out =~ s!^(test(?:db)?_(?:static|dynamic)\b.*)!$1 lib/Storable/Limit.pm!gm; + $out =~ s!^(test(?:db)?_(?:static|dynamic)\b.*)!$1 $limit_pm!gm; } $out;