In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/ad06747f486468ec1dcb0c14ed07974c25c2fbd3?hp=0d7b27597cc56fd28bf02a6f3e4caeec29e98f62>
- Log ----------------------------------------------------------------- commit ad06747f486468ec1dcb0c14ed07974c25c2fbd3 Author: Brian Fraser <[email protected]> Date: Wed Dec 18 16:45:52 2013 -0300 config.ce: Use ~cc~, not ~CC~ This was preventing several things from working properly, like Errno_pm.PL, which tried to use $Config{cppstdin}, which was not set properly. M win32/config.ce commit 252696ecc516bed42ed7b28e862227f3faf7d46a Author: Jess Robinson <[email protected]> Date: Fri Jan 18 15:54:51 2013 +0000 Amend pod_lib.pl to work with miniperl (no dynamic loading) This is to allow cross-compilation builds to run installperl using a host miniperl instead of the built Perl binary. M Porting/pod_lib.pl ----------------------------------------------------------------------- Summary of changes: Porting/pod_lib.pl | 14 +++++++++++++- win32/config.ce | 8 ++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Porting/pod_lib.pl b/Porting/pod_lib.pl index 06c3294..ed8e8ef 100644 --- a/Porting/pod_lib.pl +++ b/Porting/pod_lib.pl @@ -1,7 +1,6 @@ #!/usr/bin/perl -w use strict; -use Digest::MD5 'md5'; use File::Find; =head1 NAME @@ -62,6 +61,17 @@ Prints C<ABORTED> to STDERR. =cut +# In some situations, eg cross-compiling, we get run with miniperl, so we can't use Digest::MD5 +my $has_md5; +BEGIN { + use Carp; + $has_md5 = eval { require Digest::MD5; Digest::MD5->import('md5'); 1; }; +} + + +# make it clearer when we haven't run to completion, as we can be quite +# noisy when things are working ok + sub my_die { print STDERR "$0: ", @_; print STDERR "\n" unless $_[-1] =~ /\n\z/; @@ -366,6 +376,8 @@ my %state = ( my $file = shift; local $_; + return if !$has_md5; + # Initialise the list of possible source files on the first call. unless (%Lengths) { __prime_state() unless $state{master}; diff --git a/win32/config.ce b/win32/config.ce index 3e70a81..c20e1bf 100644 --- a/win32/config.ce +++ b/win32/config.ce @@ -41,7 +41,7 @@ byteorder='1234' c='' castflags='0' cat='type' -cc='~CC~' +cc='~cc~' cccdlflags=' ' ccdlflags=' ' ccflags='-DWIN32' @@ -59,14 +59,14 @@ compress='' contains='grep' cp='copy' cpio='' -cpp='~CC~ -nologo -E' +cpp='~cc~ -nologo -E' cpp_stuff='42' cppccsymbols='' cppflags='-DWIN32' cpplast='' cppminus='' -cpprun='~CC~ -nologo -E' -cppstdin='~CC~ -nologo -E' +cpprun='~cc~ -nologo -E' +cppstdin='~cc~ -nologo -E' cppsymbols='' crosscompile='undef' crypt_r_proto='0' -- Perl5 Master Repository
