diff options
author | Karl Berry <karl@freefriends.org> | 2017-04-18 23:10:57 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-04-18 23:10:57 +0000 |
commit | 40b4b6e177c62a14c166dbba6adf3abc415af4b2 (patch) | |
tree | 2996bf29509c806bd8064fb6cf38092c1b375ff8 /Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform | |
parent | 8e743c86b6872f30b7a35c72aa944455157d4b3f (diff) |
tlperl 5.24.1 from siep
git-svn-id: svn://tug.org/texlive/trunk@43914 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform')
12 files changed, 52 insertions, 35 deletions
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Unix.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Unix.pm index a05ae4bca6f..399e254aa0c 100644 --- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Unix.pm +++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Unix.pm @@ -1,5 +1,6 @@ package ExtUtils::CBuilder::Platform::Unix; -$ExtUtils::CBuilder::Platform::Unix::VERSION = '0.280221'; +$ExtUtils::CBuilder::Platform::Unix::VERSION = '0.280225'; +use warnings; use strict; use ExtUtils::CBuilder::Base; @@ -20,19 +21,19 @@ sub link_executable { sub link { my $self = shift; my $cf = $self->{config}; - + # Some platforms (notably Mac OS X 10.3, but some others too) expect # the syntax "FOO=BAR /bin/command arg arg" to work in %Config # (notably $Config{ld}). It usually works in system(SCALAR), but we # use system(LIST). We fix it up here with 'env'. - + local $cf->{ld} = $cf->{ld}; if (ref $cf->{ld}) { unshift @{$cf->{ld}}, 'env' if $cf->{ld}[0] =~ /^\s*\w+=/; } else { $cf->{ld} =~ s/^(\s*\w+=)/env $1/; } - + return $self->SUPER::link(@_); } diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/VMS.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/VMS.pm index 6285e33692d..e9d9f6fc2fd 100644 --- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/VMS.pm +++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/VMS.pm @@ -1,5 +1,6 @@ package ExtUtils::CBuilder::Platform::VMS; -$ExtUtils::CBuilder::Platform::VMS::VERSION = '0.280221'; +$ExtUtils::CBuilder::Platform::VMS::VERSION = '0.280225'; +use warnings; use strict; use ExtUtils::CBuilder::Base; @@ -27,11 +28,11 @@ sub arg_defines { return '' unless keys(%args) || @config_defines; - return ('/define=(' - . join(',', + return ('/define=(' + . join(',', @config_defines, - map "\"$_" . ( length($args{$_}) ? "=$args{$_}" : '') . "\"", - keys %args) + map "\"$_" . ( length($args{$_}) ? "=$args{$_}" : '') . "\"", + sort keys %args) . ')'); } @@ -50,7 +51,7 @@ sub arg_include_dirs { # We override the compile method because we consume the includes and defines # parts of ccflags in the process of compiling but don't save those parts # anywhere, so $self->{config}{ccflags} needs to be reset for each compile -# operation. +# operation. sub compile { my ($self, %args) = @_; @@ -63,10 +64,10 @@ sub compile { sub _do_link { my ($self, $type, %args) = @_; - + my $objects = delete $args{objects}; $objects = [$objects] unless ref $objects; - + if ($args{lddl}) { # prelink will call Mksymlists, which creates the extension-specific @@ -77,7 +78,7 @@ sub _do_link { # We now add the rest of what we need to the linker options file. We # should replicate the functionality of C<ExtUtils::MM_VMS::dlsyms>, # but there is as yet no infrastructure for handling object libraries, - # so for now we depend on object files being listed individually on the + # so for now we depend on object files being listed individually on the # command line, which should work for simple cases. We do bring in our # own version of C<ExtUtils::Liblist::Kid::ext> so that any additional # libraries (including PERLSHR) can be added to the options file. @@ -85,7 +86,7 @@ sub _do_link { my @optlibs = $self->_liblist_ext( $args{'libs'} ); my $optfile = 'sys$disk:[]' . $temp_files[0]; - open my $opt_fh, '>>', $optfile + open my $opt_fh, '>>', $optfile or die "_do_link: Unable to open $optfile: $!"; for my $lib (@optlibs) {print $opt_fh "$lib\n" if length $lib } close $opt_fh; @@ -136,7 +137,7 @@ sub _liblist_ext { # which a system-wide logical may point. if ($self->perl_src) { my($lib,$locspec,$type); - foreach $lib (@crtls) { + foreach $lib (@crtls) { if (($locspec,$type) = $lib =~ m{^([\w\$-]+)(/\w+)?} and $locspec =~ /perl/i) { if (lc $type eq '/share') { $locspec .= $self->{'config'}{'exe_ext'}; } elsif (lc $type eq '/library') { $locspec .= $self->{'config'}{'lib_ext'}; } @@ -188,8 +189,8 @@ sub _liblist_ext { next; } warn "Resolving directory $dir\n" if $verbose; - if (!File::Spec->file_name_is_absolute($dir)) { - $dir = catdir($cwd,$dir); + if (!File::Spec->file_name_is_absolute($dir)) { + $dir = catdir($cwd,$dir); } } @dirs = grep { length($_) } @dirs; @@ -243,14 +244,14 @@ sub _liblist_ext { $type = 'SHR'; $name = $fullname unless $fullname =~ /exe;?\d*$/i; } - elsif (not length($ctype) and # If we've got a lib already, + elsif (not length($ctype) and # If we've got a lib already, # don't bother ( -f ($fullname = VMS::Filespec::rmsexpand($name,$lib_ext)) or -f ($fullname = VMS::Filespec::rmsexpand($name,'.olb')))) { $type = 'OLB'; $name = $fullname unless $fullname =~ /olb;?\d*$/i; } - elsif (not length($ctype) and # If we've got a lib already, + elsif (not length($ctype) and # If we've got a lib already, # don't bother ( -f ($fullname = VMS::Filespec::rmsexpand($name,$obj_ext)) or -f ($fullname = VMS::Filespec::rmsexpand($name,'.obj')))) { @@ -264,9 +265,9 @@ sub _liblist_ext { last if $ctype eq 'SHR'; } } - if ($ctype) { + if ($ctype) { push @{$found{$ctype}}, $cand; - warn "\tFound as $cand (really $fullname), type $ctype\n" + warn "\tFound as $cand (really $fullname), type $ctype\n" if $verbose > 1; push @flibs, $name unless $libs_seen{$fullname}++; next LIB; diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows.pm index 472c8012da3..80b8f29cd2d 100644 --- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows.pm +++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows.pm @@ -1,5 +1,5 @@ package ExtUtils::CBuilder::Platform::Windows; -$ExtUtils::CBuilder::Platform::Windows::VERSION = '0.280221'; +$ExtUtils::CBuilder::Platform::Windows::VERSION = '0.280225'; use strict; use warnings; @@ -57,7 +57,7 @@ sub split_like_shell { # array) to the target program and make the program parse it itself, # we don't actually need to do any processing here. (my $self, local $_) = @_; - + return @$_ if defined() && UNIVERSAL::isa($_, 'ARRAY'); return unless defined() && length(); return ($_); @@ -76,7 +76,7 @@ sub do_system { sub arg_defines { my ($self, %args) = @_; s/"/\\"/g foreach values %args; - return map qq{"-D$_=$args{$_}"}, keys %args; + return map qq{"-D$_=$args{$_}"}, sort keys %args; } sub compile { @@ -85,7 +85,7 @@ sub compile { die "Missing 'source' argument to compile()" unless defined $args{source}; - $args{include_dirs} = [ $args{include_dirs} ] + $args{include_dirs} = [ $args{include_dirs} ] if exists($args{include_dirs}) && ref($args{include_dirs}) ne "ARRAY"; my ($basename, $srcdir) = @@ -151,7 +151,7 @@ sub link { # if running in perl source tree, look for libs there, not installed my $lddlflags = $cf->{lddlflags}; my $perl_src = $self->perl_src(); - $lddlflags =~ s/\Q$cf->{archlibexp}\E[\\\/]CORE/$perl_src/ if $perl_src; + $lddlflags =~ s/\Q$cf->{archlibexp}\E[\\\/]CORE/$perl_src\/lib\/CORE/ if $perl_src; my %spec = ( srcdir => $to, diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/BCC.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/BCC.pm index cbba074146a..513c4acaeea 100644 --- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/BCC.pm +++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/BCC.pm @@ -1,5 +1,8 @@ package ExtUtils::CBuilder::Platform::Windows::BCC; -$ExtUtils::CBuilder::Platform::Windows::BCC::VERSION = '0.280220'; +$ExtUtils::CBuilder::Platform::Windows::BCC::VERSION = '0.280225'; +use strict; +use warnings; + sub format_compiler_cmd { my ($self, %spec) = @_; diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/GCC.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/GCC.pm index eb37a0e1711..19851df352e 100644 --- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/GCC.pm +++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/GCC.pm @@ -1,5 +1,8 @@ package ExtUtils::CBuilder::Platform::Windows::GCC; -$ExtUtils::CBuilder::Platform::Windows::GCC::VERSION = '0.280220'; +$ExtUtils::CBuilder::Platform::Windows::GCC::VERSION = '0.280225'; +use warnings; +use strict; + sub format_compiler_cmd { my ($self, %spec) = @_; diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/MSVC.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/MSVC.pm index 8457485e22f..c8d675f4978 100644 --- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/MSVC.pm +++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/MSVC.pm @@ -1,5 +1,8 @@ package ExtUtils::CBuilder::Platform::Windows::MSVC; -$ExtUtils::CBuilder::Platform::Windows::MSVC::VERSION = '0.280220'; +$ExtUtils::CBuilder::Platform::Windows::MSVC::VERSION = '0.280225'; +use warnings; +use strict; + sub arg_exec_file { my ($self, $file) = @_; return "/OUT:$file"; diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/aix.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/aix.pm index c40dfaa5f46..488d3e68bc9 100644 --- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/aix.pm +++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/aix.pm @@ -1,5 +1,6 @@ package ExtUtils::CBuilder::Platform::aix; -$ExtUtils::CBuilder::Platform::aix::VERSION = '0.280221'; +$ExtUtils::CBuilder::Platform::aix::VERSION = '0.280225'; +use warnings; use strict; use ExtUtils::CBuilder::Platform::Unix; use File::Spec; diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/android.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/android.pm index 8ceb1454d6d..b9e6af3129c 100644 --- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/android.pm +++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/android.pm @@ -1,5 +1,6 @@ package ExtUtils::CBuilder::Platform::android; -$ExtUtils::CBuilder::Platform::android::VERSION = '0.280221'; +$ExtUtils::CBuilder::Platform::android::VERSION = '0.280225'; +use warnings; use strict; use File::Spec; use ExtUtils::CBuilder::Platform::Unix; diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/cygwin.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/cygwin.pm index 9f1e7fea397..339840f8c19 100644 --- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/cygwin.pm +++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/cygwin.pm @@ -1,5 +1,6 @@ package ExtUtils::CBuilder::Platform::cygwin; -$ExtUtils::CBuilder::Platform::cygwin::VERSION = '0.280221'; +$ExtUtils::CBuilder::Platform::cygwin::VERSION = '0.280225'; +use warnings; use strict; use File::Spec; use ExtUtils::CBuilder::Platform::Unix; diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/darwin.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/darwin.pm index 391040bb934..04a87da3311 100644 --- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/darwin.pm +++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/darwin.pm @@ -1,5 +1,6 @@ package ExtUtils::CBuilder::Platform::darwin; -$ExtUtils::CBuilder::Platform::darwin::VERSION = '0.280221'; +$ExtUtils::CBuilder::Platform::darwin::VERSION = '0.280225'; +use warnings; use strict; use ExtUtils::CBuilder::Platform::Unix; diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/dec_osf.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/dec_osf.pm index 5d4bdf78b13..d503e8614bf 100644 --- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/dec_osf.pm +++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/dec_osf.pm @@ -1,5 +1,6 @@ package ExtUtils::CBuilder::Platform::dec_osf; -$ExtUtils::CBuilder::Platform::dec_osf::VERSION = '0.280221'; +$ExtUtils::CBuilder::Platform::dec_osf::VERSION = '0.280225'; +use warnings; use strict; use ExtUtils::CBuilder::Platform::Unix; use File::Spec; diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/os2.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/os2.pm index a5d81ca3311..8d0e3eb0dc2 100644 --- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/os2.pm +++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/os2.pm @@ -1,5 +1,6 @@ package ExtUtils::CBuilder::Platform::os2; -$ExtUtils::CBuilder::Platform::os2::VERSION = '0.280221'; +$ExtUtils::CBuilder::Platform::os2::VERSION = '0.280225'; +use warnings; use strict; use ExtUtils::CBuilder::Platform::Unix; |