Files
MINGW-packages/mingw-w64-perl/004-fix-cpan-external-programs.patch
Niklas Holm 6d55c8eb80 Update perl to v5.28.0 (#4044)
* mingw-w64-perl: update to v5.28.0

* mingw-w64-perl: Add build options

- USE_64_BIT_INT: 64-bit integers in 32-bit build
- USE_MINGW_ANSI_STDIO: Enable MINGW's ANSI stdio extensions

Inspired by Strawberry Perl's build.

* mingw-w64-perl: Packaging improvements

- New script to update provides array (updpkgprovs)
  * updpkgprovs takes information from corelist
  * patchprov produced lowercase package names witch doesn't match the
    module naming convention
  * patchprov missed a lot of packages which modules declares dependency
    on
- Move pods to doc package (pods are documentation read by perldoc)
- Keep relocation list in install script instead of seperate file
- Make minor improvements to profile script (fewer subshells => faster)
- Various minor improvements
2018-07-05 13:32:26 +03:00

28 lines
1.1 KiB
Diff

diff --git 003/cpan/CPAN/lib/CPAN/FirstTime.pm 004/cpan/CPAN/lib/CPAN/FirstTime.pm
index 49fa8ab..4f59593 100644
--- 003/cpan/CPAN/lib/CPAN/FirstTime.pm
+++ 004/cpan/CPAN/lib/CPAN/FirstTime.pm
@@ -1492,6 +1492,22 @@ sub _init_external_progs {
next;
}
+ # Let's not store full paths to programs in MSYS2 because
+ # paths change across shells. For example let's not use 32-bit
+ # programs in the 64-bit shell.
+
+ if ($^O eq 'MSWin32') {
+ $CPAN::Config->{$progname} = $CPAN::Config->{$progname}
+ || $Config::Config{$progname}
+ || $progname;
+ if ($CPAN::Config->{$progname} eq 'make') {
+ # (msys) make doesn't like the cmd.exe-friendly makefiles that are
+ # created when installing modules, so stick to mingw32-make.
+ $CPAN::Config->{$progname} = 'mingw32-make';
+ }
+ next;
+ }
+
my $progcall = $progname;
unless ($matcher) {
# we really don't need ncftp if we have ncftpget, but