1 From 682a4acb98783a7f9b5c286b308f12863599fec3 Mon Sep 17 00:00:00 2001
2 From: Tony Cook <tony@develop-help.com>
3 Date: Mon, 30 Jul 2018 21:00:52 +1000
4 Subject: (perl #133411) don't try to load Storable with -Dusecrosscompile
7 dist/Storable/Makefile.PL | 9 ++++++++-
8 dist/Storable/stacksize | 10 +++++++---
9 2 files changed, 15 insertions(+), 4 deletions(-)
11 --- a/dist/Storable/Makefile.PL
12 +++ b/dist/Storable/Makefile.PL
13 @@ -90,12 +90,19 @@ sub depend {
14 # blib.pm needs arch/lib
15 $extra_deps = ' Storable.pm';
18 + if ($Config::Config{usecrosscompile}) {
19 + $whichperl = '$(PERLRUN)';
22 + $whichperl = '$(FULLPERLRUNINST)';
24 my $linktype = uc($_[0]->{LINKTYPE});
25 my $limit_pm = File::Spec->catfile('lib', 'Storable', 'Limit.pm');
27 $limit_pm : stacksize \$(INST_$linktype)$extra_deps
28 \$(MKPATH) \$(INST_LIB)
29 - \$(FULLPERLRUNINST) stacksize $options
30 + $whichperl stacksize $options
34 --- a/dist/Storable/stacksize
35 +++ b/dist/Storable/stacksize
36 @@ -7,6 +7,9 @@ use Cwd;
40 +-d "lib" or mkdir "lib";
41 +-d "lib/Storable" or mkdir "lib/Storable";
43 my $fn = "lib/Storable/Limit.pm";
44 my $ptrsize = $Config{ptrsize};
45 my ($bad1, $bad2) = (65001, 25000);
46 @@ -29,6 +32,10 @@ sub is_miniperl {
50 + if ($Config{usecrosscompile}) {
51 + write_limits(500, 265);
54 die "Should not run during miniperl\n";
57 @@ -68,9 +75,6 @@ if ($ENV{PERL_CORE}) {
61 --d "lib" or mkdir "lib";
62 --d "lib/Storable" or mkdir "lib/Storable";
64 if ($^O eq "MSWin32") {
66 my ($str, $major, $minor) = Win32::GetOSVersion();