From 926760a67ed43045b7686a4475d0362da2bbcd8b Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Mon, 27 May 2019 12:07:25 -0600 Subject: [PATCH] Make sure 'if' compiled before Pod::Simple 3.36 of Pod::Simple requires 'if', and this makes sure it works. --- Makefile.SH | 1 + make_ext.pl | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile.SH b/Makefile.SH index 9ae1723d53..0d925bc2b9 100755 --- a/Makefile.SH +++ b/Makefile.SH @@ -197,6 +197,7 @@ done dynamic_list=' ' dynamic_ext_re="lib/auto/re/re.$dlext" extra_dep=' +cpan/Pod-Simple/pm_to_blib: dist/if/pm_to_blib ext/Pod-Functions/pm_to_blib: cpan/Pod-Simple/pm_to_blib cpan/Pod-Escapes/pm_to_blib pod/perlfunc.pod cpan/IO-Compress/pm_to_blib: dist/lib/pm_to_blib ' diff --git a/make_ext.pl b/make_ext.pl index b9630633cb..0280a027cf 100644 --- a/make_ext.pl +++ b/make_ext.pl @@ -217,18 +217,21 @@ elsif (IS_VMS) { { # XXX hack for dependency ordering # Cwd needs to be built before Encode recurses into subdirectories. - # Pod::Simple needs to be built before Pod::Functions + # Pod::Simple needs to be built before Pod::Functions, but after 'if' # lib needs to be built before IO-Compress # This seems to be the simplest way to ensure this ordering: - my (@first, @other); + my (@first, @second, @other); foreach (@extspec) { - if ($_ eq 'Cwd' || $_ eq 'Pod/Simple' || $_ eq 'lib') { + if ($_ eq 'Cwd' || $_ eq 'if' || $_ eq 'lib') { push @first, $_; + } + elsif ($_ eq 'Pod/Simple') { + push @second, $_; } else { push @other, $_; } } - @extspec = (@first, @other); + @extspec = (@first, @second, @other); } if ($Config{osname} eq 'catamount' and @extspec) {