}
use strict;
-use vars qw($Is_VMS $Is_W32 $Is_OS2 $Is_Cygwin $Is_Darwin $Is_NetWare
- %opts $packlist);
+our ($Is_VMS, $Is_W32, $Is_OS2, $Is_Cygwin, $Is_Darwin, $Is_NetWare, $Is_AmigaOS,
+ %opts, $packlist);
my $versiononly;
BEGIN {
if ($Is_VMS) { eval 'use VMS::Filespec;' }
}
+# HP-UX (at least) needs to maintain execute permissions
+# on dynamically-loadable libraries. So we do it for all.
+#
+# In AmigaOS, the 0777 means 'rwed' (e = execute, d = delete),
+# (not 'rwx') and having the 'd' makes updates more convenient.
+my $SO_MODE = $Is_AmigaOS ? 0777 : 0555;
+my $NON_SO_MODE = $Is_AmigaOS ? 0666 : 0444;
+
my $scr_ext = ($Is_VMS ? '.Com' : $Is_W32 ? '.bat' : '');
use File::Find;
open SCRIPTS, "utils.lst" or die "Can't open utils.lst: $!";
while (<SCRIPTS>) {
next if /^#/;
- next if /a2p/; # a2p is binary, to be installed separately
chomp;
if (/(\S*)\s*#\s*link\s*=\s*(\S*)/) {
push @scripts, $1;
if ($Is_Cygwin) {
$perldll = $libperl;
} else {
- $perldll = 'perl5'.$Config{patchlevel}.'.'.$dlext;
+ $perldll = 'perl5'.$Config{patchlevel}.'.'.$so;
}
if ($dlsrc ne "dl_none.xs") {
safe_unlink("$installbin/$ndbg$perl$exe_ext");
copy("$ndbg$perl$exe_ext", "$installbin/$ndbg$perl$exe_ext");
chmod(0755, "$installbin/$ndbg$perl$exe_ext");
- safe_unlink("$installbin/${dbg}a2p$exe_ext");
- copy("x2p/${dbg}a2p$exe_ext", "$installbin/${dbg}a2p$exe_ext");
- chmod(0755, "$installbin/${dbg}a2p$exe_ext");
}
}
elsif ($^O ne 'dos') {
safe_unlink("$installbin/$perl_verbase$ver$exe_ext");
copy("perl$exe_ext", "$installbin/$perl_verbase$ver$exe_ext");
strip("$installbin/$perl_verbase$ver$exe_ext");
+ fix_dep_names("$installbin/$perl_verbase$ver$exe_ext");
chmod(0755, "$installbin/$perl_verbase$ver$exe_ext");
}
else {
# If installing onto a NetWare server
if ($opts{netware}) {
- # Copy perl.nlm, echo.nlm, type.nlm, a2p.nlm & cgi2perl.nlm
+ # Copy perl.nlm, echo.nlm, type.nlm & cgi2perl.nlm
mkpath($Config{installnwsystem});
copy("netware\\".$ENV{'MAKE_TYPE'}."\\perl.nlm", $Config{installnwsystem});
copy("netware\\testnlm\\echo\\echo.nlm", $Config{installnwsystem});
copy("netware\\testnlm\\type\\type.nlm", $Config{installnwsystem});
- copy("x2p\\a2p.nlm", $Config{installnwsystem});
chmod(0755, "$Config{installnwsystem}\\perl.nlm");
mkpath($Config{installnwlcgi});
copy("lib\\auto\\cgi2perl\\cgi2perl.nlm", $Config{installnwlcgi});
( copy("$installbin/$libperl", $coredll) &&
push(@corefiles, $instcoredll)
)
+} elsif ($Is_W32) {
+ @corefiles = <*.h>;
} else {
# [als] hard-coded 'libperl' name... not good!
@corefiles = <*.h libperl*.* perl*$Config{lib_ext}>;
# AIX needs perl.exp installed as well.
push(@corefiles,'perl.exp') if $^O eq 'aix';
}
+
+
foreach my $file (@corefiles) {
- # HP-UX (at least) needs to maintain execute permissions
- # on dynamically-loadable libraries. So we do it for all.
if (copy_if_diff($file,"$installarchlib/CORE/$file")) {
if ($file =~ /\.(\Q$so\E|\Q$dlext\E)$/) {
strip("-S", "$installarchlib/CORE/$file") if $^O eq 'darwin';
- chmod(0555, "$installarchlib/CORE/$file");
+ fix_dep_names("$installarchlib/CORE/$file");
+ chmod($SO_MODE, "$installarchlib/CORE/$file");
} else {
- chmod(0444, "$installarchlib/CORE/$file");
+ chmod($NON_SO_MODE, "$installarchlib/CORE/$file");
}
}
}
+if ($Is_W32) { #linking lib isn't made in root but in CORE on Win32
+ @corefiles = <lib/CORE/libperl*.* lib/CORE/perl*$Config{lib_ext}>;
+ my $dest;
+ copy_if_diff($_,($dest = $installarchlib.substr($_,3))) &&
+ chmod($NON_SO_MODE, $dest) foreach @corefiles;
+}
+
# Install main perl executables
# Make links to ordinary names if installbin directory isn't current directory.
}
}
-# Make links to ordinary names if installbin directory isn't current directory.
-if (!$Is_NetWare && $dbg eq '') {
- if (! samepath($installbin, 'x2p')) {
- my $base = 'a2p';
- $base .= $ver if $versiononly;
- safe_unlink("$installbin/$base$exe_ext");
- copy("x2p/a2p$exe_ext", "$installbin/$base$exe_ext");
- strip("$installbin/$base$exe_ext");
- chmod(0755, "$installbin/$base$exe_ext");
- }
-}
-
# cppstdin is just a script, but it is architecture-dependent, so
# it can't safely be shared. Place it in $installbin.
# Note that Configure doesn't build cppstin if it isn't needed, so
(my $base = $_) =~ s#.*/##;
copy($_, "$installscript/$base");
chmod(0755, "$installscript/$base");
+ if ($Is_AmigaOS) {
+ my $amigapath = unixtoamiga("$installscript/$base");
+ amigaprotect($amigapath,"+s");
+ }
}
for (@tolink) {
}
-# Check to make sure there aren't other perls around in installer's
-# path. This is probably UNIX-specific. Check all absolute directories
-# in the path except for where public executables are supposed to live.
-# Also skip $mainperl if the user opted to have it be a link to the
-# installed perl.
-
-if (!$versiononly && !$opts{'skip-otherperls'}) {
- my ($path, @path);
- my $dirsep = ($Is_OS2 || $Is_W32 || $Is_NetWare) ? ';' : ':' ;
- ($path = $ENV{"PATH"}) =~ s:\\:/:g ;
- @path = split(/$dirsep/, $path);
- if ($Is_VMS) {
- my $i = 0;
- while (exists $ENV{'DCL$PATH' . $i}) {
- my $dir = unixpath($ENV{'DCL$PATH' . $i}); $dir =~ s-/$--;
- push(@path,$dir);
- }
- }
- my @otherperls;
- my %otherperls;
- for (@path) {
- next unless m,^/,;
- # Use &samepath here because some systems have other dirs linked
- # to $mainperldir (like SunOS)
- next unless -d;
- next if samepath($_, $binexp);
- next if samepath($_, cwd());
- next if ($mainperl_is_instperl && samepath($_, $mainperldir));
- my $otherperl = "$_/$perl$exe_ext";
- next if $otherperls{$otherperl}++;
- push(@otherperls, $otherperl)
- if (-x $otherperl && ! -d $otherperl);
- }
- if (@otherperls) {
- warn "\nWarning: $perl appears in your path in the following " .
- "locations beyond where\nwe just installed it:\n";
- for (@otherperls) {
- warn " ", $_, "\n";
- }
- warn "\n";
- }
-
-}
$packlist->write() unless $opts{notify};
print " Installation complete\n" if $opts{verbose};
return if $name =~ /^(?:cpan|instmodsh|prove|corelist|ptar|ptardiff|ptargrep|zipdetails)\z/;
# ignore the Makefiles
return if $name =~ /^makefile$/i;
- # ignore the test extensions
- return if $dir =~ m{\bXS/(?:APItest|Typemap)\b};
+ # ignore the test extensions, dont install PPPort.so/.dll
+ return if $dir =~ m{\b(?:XS/(?:APItest|Typemap)|Devel/PPPort)\b};
return if $name =~ m{\b(?:APItest|Typemap)\.pm$};
# ignore the build support code
return if $name =~ /\bbuildcustomize\.pl$/;
return if $name eq 'ExtUtils/XSSymSet.pm' and !$Is_VMS;
+ #blead comes with version, blead isn't 5.8/5.6
+ return if $name eq 'ExtUtils/MakeMaker/version/regex.pm';
+
my $installlib = $installprivlib;
if ($dir =~ /^auto\// ||
($name =~ /^(.*)\.(?:pm|pod)$/ && $archpms{$1}) ||
if (copy_if_diff($_, "$installlib/$name")) {
strip("-S", "$installlib/$name")
if $^O eq 'darwin' and /\.(?:so|$dlext|a)$/;
- chmod(/\.(so|$dlext)$/ ? 0555 : 0444, "$installlib/$name");
+ chmod(/\.(so|$dlext)$/ ? $SO_MODE : $NON_SO_MODE,
+ "$installlib/$name");
}
}
}
}
}
-# Local variables:
-# cperl-indent-level: 4
-# indent-tabs-mode: nil
-# End:
-#
+sub fix_dep_names {
+ my $file = shift;
+
+ $^O eq "darwin" && $Config{osvers} =~ /^(1[5-9]|[2-9])/
+ && $Config{useshrplib}
+ or return;
+
+ my @opts;
+ my $so = $Config{so};
+ my $libperl = "$Config{archlibexp}/CORE/libperl.$Config{so}";
+ if ($file =~ /\blibperl.\Q$Config{so}\E$/a) {
+ push @opts, -id => $libperl;
+ }
+ else {
+ push @opts, -change => getcwd . "/libperl.$so", $libperl;
+ }
+ push @opts, $file;
+
+ $opts{verbose} and print " install_name_tool @opts\n";
+ system "install_name_tool", @opts
+ and die "Cannot update $file dependency paths\n";
+}
+
# ex: set ts=8 sts=4 sw=4 et:
https://perl5.git.perl.org / perl5.git / blobdiff