Commit f35d05c3 authored by Niko Tyni's avatar Niko Tyni

unpatch

parent 25055c93
......@@ -1289,7 +1289,8 @@ defvoidused=15
: List of libraries we want.
: If anyone needs extra -lxxx, put those in a hint file.
libswanted='gdbm gdbm_compat db dl m c crypt'
libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun"
libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
: We probably want to search /usr/shlib before most other libraries.
: This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
......@@ -4775,19 +4776,19 @@ default|recommended)
echo "Nope, it doesn't, but that's ok." 2>&1
fi
# echo "Checking if your compiler accepts -Wdeclaration-after-statement" 2>&1
# echo 'int main(void) { return 0; }' > gcctest.c
# if $cc -Wdeclaration-after-statement -o gcctest gcctest.c; then
# echo "Yes, it does." 2>&1
# case "$ccflags" in
# *-Wdeclaration-after-statement*)
# echo "Leaving current flags $ccflags alone." 2>&1
# ;;
# *) dflt="$dflt -Wdeclaration-after-statement" ;;
# esac
# else
# echo "Nope, it doesn't, but that's ok." 2>&1
# fi
echo "Checking if your compiler accepts -Wdeclaration-after-statement" 2>&1
echo 'int main(void) { return 0; }' > gcctest.c
if $cc -Wdeclaration-after-statement -o gcctest gcctest.c; then
echo "Yes, it does." 2>&1
case "$ccflags" in
*-Wdeclaration-after-statement*)
echo "Leaving current flags $ccflags alone." 2>&1
;;
*) dflt="$dflt -Wdeclaration-after-statement" ;;
esac
else
echo "Nope, it doesn't, but that's ok." 2>&1
fi
;;
esac
;;
......@@ -20023,7 +20024,7 @@ set mntent.h i_mntent
eval $inhdr
: see if ndbm.h is available
set gdbm-ndbm.h t_ndbm
set ndbm.h t_ndbm
eval $inhdr
case "$t_ndbm" in
......@@ -20874,7 +20875,7 @@ sunos*X4*)
;;
*) case "$usedl" in
$define|true|[yY]*)
set X `echo " $libs " | sed -e 's@ -lgdbm @ @' -e 's@ -lgdbm_compat @ @' -e 's@ -ldb @ @'`
set X `echo " $libs " | sed -e 's@ -lndbm @ @' -e 's@ -lgdbm @ @' -e 's@ -ldbm @ @' -e 's@ -ldb @ @'`
shift
perllibs="$*"
;;
......
......@@ -43,7 +43,12 @@ case "$useshrplib" in
true)
# Prefix all runs of 'miniperl' and 'perl' with
# $ldlibpth so that ./perl finds *this* shared libperl.
ldlibpth=LD_LIBRARY_PATH=`pwd`'$${LD_LIBRARY_PATH:+:}$$LD_LIBRARY_PATH'
case "$LD_LIBRARY_PATH" in
'')
ldlibpth="LD_LIBRARY_PATH=`pwd`";;
*)
ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";;
esac
pldlflags="$cccdlflags"
static_target='static_pic'
......@@ -96,7 +101,7 @@ true)
;;
esac
case "$ldlibpthname" in
''|LD_LIBRARY_PATH) ;;
'') ;;
*)
case "$osname" in
os2)
......
......@@ -109,13 +109,7 @@ for file do
pp) ;;
pp_ctl) ;;
pp_hot) ;;
pp_pack)
case $archname in
arm-*|armeb-*)
optimize=-Os;;
hppa-*|mips*-*)
optimize="$optimize -fno-delayed-branch";;
esac;;
pp_pack) ;;
pp_sys) ;;
regcomp) ;;
regexec) ;;
......
......@@ -647,7 +647,7 @@ sub B::NV::save {
return $sym if defined $sym;
my $val= $sv->NVX;
$val .= '.00' if $val =~ /^-?\d+$/;
$xpvnvsect->add(sprintf("0, 0, 0, %d, %s", $sv->NVX, $val));
$xpvnvsect->add(sprintf("0, 0, 0, %d, %s", $sv->IVX, $val));
$svsect->add(sprintf("&xpvnv_list[%d], %lu, 0x%x",
$xpvnvsect->index, $sv->REFCNT , $sv->FLAGS));
return savesym($sv, sprintf("&sv_list[%d]", $svsect->index));
......
......@@ -48,14 +48,12 @@ __getBerkeleyDBInfo()
(void)db_version(&Major, &Minor, &Patch) ;
#ifndef DEBIAN
/* Check that the versions of db.h and libdb.a are the same */
if (Major != DB_VERSION_MAJOR || Minor != DB_VERSION_MINOR
|| Patch != DB_VERSION_PATCH)
croak("\nDB_File needs compatible versions of libdb & db.h\n\tyou have db.h version %d.%d.%d and libdb version %d.%d.%d\n",
DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
Major, Minor, Patch) ;
#endif /* DEBIAN */
/* check that libdb is recent enough -- we need 2.3.4 or greater */
if (Major == 2 && (Minor < 3 || (Minor == 3 && Patch < 4)))
......
......@@ -29,7 +29,7 @@ package DynaLoader;
use vars qw($VERSION *AUTOLOAD);
$VERSION = '1.04'; # avoid typo warning
$VERSION = '1.05'; # avoid typo warning
require AutoLoader;
*AUTOLOAD = \&AutoLoader::AUTOLOAD;
......@@ -85,6 +85,7 @@ $Mac_FS = eval { require Mac::FileSpec::Unixish } if $Is_MacOS;
@dl_library_path = (); # path to look for files
#XSLoader.pm may have added elements before we were required
#@dl_shared_objects = (); # shared objects for symbols we have
#@dl_librefs = (); # things we have loaded
#@dl_modules = (); # Modules we have loaded
......@@ -339,6 +340,9 @@ print OUT <<'EOT';
my $xs = dl_install_xsub("${module}::bootstrap", $boot_symbol_ref, $file);
# See comment block above
push(@dl_shared_objects, $file); # record files loaded
&$xs(@args);
}
......@@ -555,6 +559,7 @@ DynaLoader Interface Summary
$dl_debug
@dl_librefs
@dl_modules
@dl_shared_objects
Implemented in:
bootstrap($modulename) Perl
@filepaths = dl_findfile(@names) Perl
......@@ -630,6 +635,10 @@ the loaded files.
An array of module (package) names that have been bootstrap'ed.
=item @dl_shared_objects
An array of file names for the shared objects that were loaded.
=item dl_error()
Syntax:
......
......@@ -118,6 +118,7 @@ print OUT <<'EOT';
my $xs = dl_install_xsub("${module}::bootstrap", $boot_symbol_ref, $file);
# See comment block above
push(@DynaLoader::dl_shared_objects, $file); # record files loaded
return &$xs(@_);
retry:
......
......@@ -102,6 +102,19 @@ end:
sv_setiv( ST(0), PTR2IV(obj) );
int
dl_unload_file(libref)
void * libref
CODE:
DLDEBUG(1,PerlIO_printf(Perl_debug_log, "dl_unload_file(%lx):\n", PTR2ul(libref)));
RETVAL = (shl_unload(libref) == 0 ? 1 : 0);
if (!RETVAL)
SaveError(aTHX_ "%s", Strerror(errno));
DLDEBUG(2,PerlIO_printf(Perl_debug_log, " retval = %d\n", RETVAL));
OUTPUT:
RETVAL
void *
dl_find_symbol(libhandle, symbolname)
void * libhandle
......
......@@ -909,11 +909,10 @@ sub find_e2x{
eval { require File::Find; };
my (@inc, %e2x_dir);
for my $inc (@INC){
next unless -d $inc; # skip non-existent directories
push @inc, $inc unless $inc eq '.'; #skip current dir
}
File::Find::find(
{ wanted => sub {
sub {
my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
$atime,$mtime,$ctime,$blksize,$blocks)
= lstat($_) or return;
......@@ -923,7 +922,7 @@ sub find_e2x{
$e2x_dir{$File::Find::dir} ||= $mtime;
}
return;
}, follow => 1}, @inc);
}, @inc);
warn join("\n", keys %e2x_dir), "\n";
for my $d (sort {$e2x_dir{$a} <=> $e2x_dir{$b}} keys %e2x_dir){
$_E2X = $d;
......
......@@ -315,8 +315,13 @@ EOF
package Errno;
our (\@EXPORT_OK,\%EXPORT_TAGS,\@ISA,\$VERSION,\%errno,\$AUTOLOAD);
use Exporter ();
use Config;
use strict;
"\$Config{'archname'}-\$Config{'osvers'}" eq
"$Config{'archname'}-$Config{'osvers'}" or
die "Errno architecture ($Config{'archname'}-$Config{'osvers'}) does not match executable architecture (\$Config{'archname'}-\$Config{'osvers'})";
\$VERSION = "$VERSION";
\$VERSION = eval \$VERSION;
\@ISA = qw(Exporter);
......
#include "EXTERN.h"
#include "perl.h"
#include "XSUB.h"
#include <gdbm-ndbm.h>
#include <ndbm.h>
typedef struct {
DBM * dbp ;
......
......@@ -3,4 +3,6 @@
# (no null key support)
# Jonathan Stowe <gellyfish@gellyfish.com>
use Config;
$self->{LIBS} = ['-lgdbm_compat'] if $Config{libs} =~ /(?:^|\s)-lgdbm_compat(?:\s|$)/;
use ExtUtils::Liblist;
($self->{LIBS}) = ExtUtils::Liblist->ext('-lgdbm -lgdbm_compat')
if $Config{libs} =~ /(?:^|\s)-lgdbm(?:\s|$)/;
# uses GDBM dbm compatibility feature - at least on SuSE 8.0
$self->{LIBS} = ['-lgdbm_compat'];
$self->{LIBS} = ['-lgdbm'];
......@@ -65,7 +65,7 @@ use Time::HiRes qw(gettimeofday);
my $have_alarm = $Config{d_alarm};
my $have_fork = $Config{d_fork};
my $waitfor = 300; # 10-20 seconds is normal (load affects this).
my $waitfor = 60; # 10-20 seconds is normal (load affects this).
my $timer_pid;
my $TheEnd;
......
......@@ -94,6 +94,13 @@ case "$optimize" in
# use -O2 by default ; -O3 doesn't seem to bring significant benefits with gcc
'')
optimize='-O2'
case "`uname -m`" in
ppc*)
# on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
# with -O2 ; so downgrade to -O1.
optimize='-O1'
;;
esac
;;
esac
......@@ -253,7 +260,6 @@ case "`uname -m`" in
sparc*)
case "$cccdlflags" in
*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
*-fPIC*) ;;
*) cccdlflags="$cccdlflags -fPIC" ;;
esac
;;
......
......@@ -156,8 +156,11 @@ find(sub {
if ("$File::Find::dir/$_" =~ m{^ext\b(.*)/([^/]+)\.pm$}) {
my($path, $modname) = ($1,$2);
# strip to optional "/lib", or remove trailing component
$path =~ s{.*/lib\b}{} or $path =~ s{/[^/]*$}{};
# strip trailing component first
$path =~ s{/[^/]*$}{};
# strip optional "/lib";
$path =~ s{/lib\b}{};
# strip any leading /
$path =~ s{^/}{};
......@@ -848,7 +851,7 @@ sub installlib {
}
if (-f $_) {
if (/\.(?:al|ix)$/ && !($dir =~ m[^auto/(.*)$])) {
if (/\.(?:al|ix)$/ && !($dir =~ m[^auto/(.*)$] && $archpms{$1})) {
$installlib = $installprivlib;
#We're installing *.al and *.ix files into $installprivlib,
#but we have to delete old *.al and *.ix files from the 5.000
......
......@@ -3411,7 +3411,7 @@ END_OF_FUNC
'upload' =><<'END_OF_FUNC',
sub upload {
my($self,$param_name) = self_or_default(@_);
my @param = grep(ref && defined(fileno($_)), $self->param($param_name));
my @param = grep(ref && fileno($_), $self->param($param_name));
return unless @param;
return wantarray ? @param : $param[0];
}
......
......@@ -1246,7 +1246,7 @@ sub load {
$configpm = $INC{"CPAN/MyConfig.pm"};
$redo++;
} else {
my($path_to_cpan) = '/etc/perl';
my($path_to_cpan) = File::Basename::dirname($INC{"CPAN.pm"});
my($configpmdir) = File::Spec->catdir($path_to_cpan,"CPAN");
my($configpmtest) = File::Spec->catfile($configpmdir,"Config.pm");
if (-d $configpmdir or File::Path::mkpath($configpmdir)) {
......@@ -3290,8 +3290,7 @@ happen.\a
)
) {
local($^W)= 0;
if ($CPAN::Config->{cpan_version_check} &&
$version > $CPAN::VERSION){
if ($version > $CPAN::VERSION){
$CPAN::Frontend->myprint(qq{
There's a new CPAN.pm version (v$version) available!
[Current version is v$CPAN::VERSION]
......@@ -6765,7 +6764,6 @@ defined:
index_expire after this many days refetch index files
cache_metadata use serializer to cache metadata
cpan_home local directory reserved for this package
cpan_version_check if true, warns you when the CPAN module is out of date.
dontload_hash anonymous hash: modules in the keys will not be
loaded by the CPAN::has_inst() routine
gzip location of external program gzip
......
......@@ -358,7 +358,7 @@ If you don\'t understand this question, just press ENTER.
};
$default = $CPAN::Config->{makepl_arg} || "INSTALLDIRS=site";
$default = $CPAN::Config->{makepl_arg} || "";
$CPAN::Config->{makepl_arg} =
prompt("Parameters for the 'perl Makefile.PL' command?
Typical frequently used settings:
......@@ -464,7 +464,6 @@ be echoed to the terminal!
# We don't ask that now, it will be noticed in time, won't it?
$CPAN::Config->{'inhibit_startup_message'} = 0;
$CPAN::Config->{'cpan_version_check'} = 1;
$CPAN::Config->{'getcwd'} = 'cwd';
print "\n\n";
......@@ -554,9 +553,6 @@ sub picklist {
$pos = 0 if $pos >= @$items;
my $num = prompt($prompt,$default);
unless ($num or -t) {
die "No default for '$prompt',\naborting non-interactive setup.\n";
}
@nums = split (' ', $num);
my $i = scalar @$items;
......
......@@ -300,9 +300,6 @@ and extensions in your C/C++ applications.
Typically, an application B<Makefile> will invoke ExtUtils::Embed
functions while building your application.
Note that on Debian systems the B<libperl-dev> package is required for
compiling applications which embed an interpreter.
=head1 @EXPORT
ExtUtils::Embed exports the following functions:
......
......@@ -173,8 +173,8 @@ sub install {
if (-f $targetfile){
forceunlink($targetfile) unless $nonono;
} else {
mkpath($targetdir) unless $nonono;
print "mkpath($targetdir)\n" if $verbose>1;
mkpath($targetdir,0,0755) unless $nonono;
print "mkpath($targetdir,0,0755)\n" if $verbose>1;
}
copy($sourcefile, $targetfile) unless $nonono;
print "Installing $targetfile\n";
......
......@@ -54,9 +54,6 @@ sub _unix_os2_ext {
my($pwd) = cwd(); # from Cwd.pm
my($found) = 0;
# Debian-specific: don't use LD_RUN_PATH for standard dirs
$ld_run_path_seen{$_}++ for qw(/lib /usr/lib /usr/X11R6/lib);
foreach $thislib (split ' ', $potential_libs){
# Handle possible linker path arguments.
......
......@@ -2,7 +2,7 @@ package ExtUtils::MM_Any;
use strict;
use vars qw($VERSION @ISA);
$VERSION = '0.13_01';
$VERSION = '0.13';
use File::Spec;
BEGIN { @ISA = qw(File::Spec); }
......@@ -645,6 +645,8 @@ all POD files in MAN1PODS and MAN3PODS.
sub manifypods_target {
my($self) = shift;
my $man1pods = '';
my $man3pods = '';
my $dependencies = '';
# populate manXpods & dependencies:
......@@ -664,7 +666,7 @@ END
foreach my $section (qw(1 3)) {
my $pods = $self->{"MAN${section}PODS"};
push @man_cmds, $self->split_command(<<CMD, %$pods);
\$(NOECHO) \$(POD2MAN) --section=\$(MAN${section}EXT) --perm_rw=\$(PERM_RW)
\$(NOECHO) \$(POD2MAN) --section=$section --perm_rw=\$(PERM_RW)
CMD
}
......@@ -1043,19 +1045,12 @@ sub init_INSTALL_from_PREFIX {
$self->{INSTALLSITEBIN} ||= '$(INSTALLBIN)'
unless $Config{installsitebin};
$self->{INSTALLSITESCRIPT} ||= '$(INSTALLSCRIPT)'
unless $Config{installsitescript};
unless( $Config{installvendorbin} ) {
$self->{INSTALLVENDORBIN} ||= $Config{usevendorprefix}
? $Config{installbin}
: '';
}
unless( $Config{installvendorscript} ) {
$self->{INSTALLVENDORSCRIPT} ||= $Config{usevendorprefix}
? $Config{installscript}
: '';
}
my $iprefix = $Config{installprefixexp} || $Config{installprefix} ||
......@@ -1078,11 +1073,9 @@ sub init_INSTALL_from_PREFIX {
$self->{SITEPREFIX} ||= $sprefix;
$self->{VENDORPREFIX} ||= $vprefix;
my $p = $self->{PREFIX} = $self->{PERLPREFIX};
for my $t (qw/PERL SITE VENDOR/)
{
$self->{"${t}PREFIX"} =~ s!^\Q$p\E(?=/|$)!\$(PREFIX)!;
}
# Lots of MM extension authors like to use $(PREFIX) so we
# put something sensible in there no matter what.
$self->{PREFIX} = '$('.uc $self->{INSTALLDIRS}.'PREFIX)';
}
my $arch = $Config{archname};
......@@ -1118,12 +1111,6 @@ sub init_INSTALL_from_PREFIX {
script => { s => $iprefix,
t => 'perl',
d => 'bin' },
vendorscript=> { s => $vprefix,
t => 'vendor',
d => 'bin' },
sitescript => { s => $sprefix,
t => 'site',
d => 'bin' },
);
my %man_layouts =
......@@ -1266,6 +1253,7 @@ sub init_INSTALL_from_INSTALLBASE {
# Adjust for variable quirks.
$install{INSTALLARCHLIB} ||= delete $install{INSTALLARCH};
$install{INSTALLPRIVLIB} ||= delete $install{INSTALLLIB};
delete @install{qw(INSTALLVENDORSCRIPT INSTALLSITESCRIPT)};
foreach my $key (keys %install) {
$self->{$key} ||= $install{$key};
......@@ -1639,7 +1627,7 @@ sub installvars {
return qw(PRIVLIB SITELIB VENDORLIB
ARCHLIB SITEARCH VENDORARCH
BIN SITEBIN VENDORBIN
SCRIPT SITESCRIPT VENDORSCRIPT
SCRIPT
MAN1DIR SITEMAN1DIR VENDORMAN1DIR
MAN3DIR SITEMAN3DIR VENDORMAN3DIR
);
......
......@@ -20,7 +20,7 @@ use vars qw($VERSION @ISA
use ExtUtils::MakeMaker qw($Verbose neatvalue);
$VERSION = '1.50_01';
$VERSION = '1.50';
require ExtUtils::MM_Any;
@ISA = qw(ExtUtils::MM_Any);
......@@ -2054,7 +2054,9 @@ doc__install : doc_site_install
$(NOECHO) $(ECHO) INSTALLDIRS not defined, defaulting to INSTALLDIRS=site
pure_perl_install ::
$(NOECHO) umask 022; $(MOD_INSTALL) \
$(NOECHO) $(MOD_INSTALL) \
read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
$(INST_LIB) $(DESTINSTALLPRIVLIB) \
$(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
$(INST_BIN) $(DESTINSTALLBIN) \
......@@ -2066,41 +2068,61 @@ pure_perl_install ::
pure_site_install ::
$(NOECHO) umask 02; $(MOD_INSTALL) \
$(NOECHO) $(MOD_INSTALL) \
read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
write }.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{ \
$(INST_LIB) $(DESTINSTALLSITELIB) \
$(INST_ARCHLIB) $(DESTINSTALLSITEARCH) \
$(INST_BIN) $(DESTINSTALLSITEBIN) \
$(INST_SCRIPT) $(DESTINSTALLSITESCRIPT) \
$(INST_SCRIPT) $(DESTINSTALLSCRIPT) \
$(INST_MAN1DIR) $(DESTINSTALLSITEMAN1DIR) \
$(INST_MAN3DIR) $(DESTINSTALLSITEMAN3DIR)
$(NOECHO) $(WARN_IF_OLD_PACKLIST) \
}.$self->catdir('$(PERL_ARCHLIB)','auto','$(FULLEXT)').q{
pure_vendor_install ::
$(NOECHO) umask 022; $(MOD_INSTALL) \
$(NOECHO) $(MOD_INSTALL) \
read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
$(INST_LIB) $(DESTINSTALLVENDORLIB) \
$(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
$(INST_BIN) $(DESTINSTALLVENDORBIN) \
$(INST_SCRIPT) $(DESTINSTALLVENDORSCRIPT) \
$(INST_SCRIPT) $(DESTINSTALLSCRIPT) \
$(INST_MAN1DIR) $(DESTINSTALLVENDORMAN1DIR) \
$(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR)
doc_perl_install ::
$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
-$(NOECHO) $(DOC_INSTALL) \
"Module" "$(NAME)" \
"installed into" "$(INSTALLPRIVLIB)" \
LINKTYPE "$(LINKTYPE)" \
VERSION "$(VERSION)" \
EXE_FILES "$(EXE_FILES)" \
>> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
doc_site_install ::
$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLSITEARCH)/perllocal.pod
-$(NOECHO) umask 02; $(MKPATH) $(DESTINSTALLSITEARCH)
-$(NOECHO) umask 02; $(DOC_INSTALL) \
$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
-$(NOECHO) $(DOC_INSTALL) \
"Module" "$(NAME)" \
"installed into" "$(INSTALLSITELIB)" \
LINKTYPE "$(LINKTYPE)" \
VERSION "$(VERSION)" \
EXE_FILES "$(EXE_FILES)" \
>> }.$self->catfile('$(DESTINSTALLSITEARCH)','perllocal.pod').q{
>> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
doc_vendor_install ::
$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
-$(NOECHO) $(DOC_INSTALL) \
"Module" "$(NAME)" \
"installed into" "$(INSTALLVENDORLIB)" \
LINKTYPE "$(LINKTYPE)" \
VERSION "$(VERSION)" \
EXE_FILES "$(EXE_FILES)" \
>> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
};
......@@ -2109,12 +2131,13 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
$(NOECHO) $(NOOP)
uninstall_from_perldirs ::
$(NOECHO) $(UNINSTALL) }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{
uninstall_from_sitedirs ::
$(NOECHO) $(UNINSTALL) }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{
uninstall_from_vendordirs ::
$(NOECHO) $(UNINSTALL) }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{
};
join("",@m);
......@@ -2392,7 +2415,7 @@ MAP_PRELIBS = $Config{perllibs} $Config{cryptlib}
($lperl = $libperl) =~ s/\$\(A\)/$self->{LIB_EXT}/;
}
unless ($libperl && -f $lperl) { # Ilya's code...
my $dir = $self->{PERL_SRC} || "/usr/lib";
my $dir = $self->{PERL_SRC} || "$self->{PERL_ARCHLIB}/CORE";
$dir = "$self->{PERL_ARCHLIB}/.." if $self->{UNINSTALLED_PERL};
$libperl ||= "libperl$self->{LIB_EXT}";
$libperl = "$dir/$libperl";
......@@ -2984,7 +3007,8 @@ sub prefixify {
print STDERR " prefixify $var => $path\n" if $Verbose >= 2;
print STDERR " from $sprefix to $rprefix\n" if $Verbose >= 2;
if( $path !~ s{^\Q$sprefix\E\b}{$rprefix}s && $self->{ARGS}{PREFIX} )
if( $self->{ARGS}{PREFIX} && $self->file_name_is_absolute($path) &&
$path !~ s{^\Q$sprefix\E\b}{$rprefix}s )
{
print STDERR " cannot prefix, using default.\n" if $Verbose >= 2;
......@@ -3028,11 +3052,14 @@ sub processPL {
# pm_to_blib depends on then it can't depend on pm_to_blib
# else we have a dependency loop.
my $pm_dep;
my $perlrun;
if( defined $self->{PM}{$target} ) {
$pm_dep = '';
$perlrun = 'PERLRUN';
}
else {
$pm_dep = 'pm_to_blib';
$perlrun = 'PERLRUNINST';
}
$m .= <<MAKE_FRAG;
......@@ -3041,7 +3068,7 @@ all :: $target
\$(NOECHO) \$(NOOP)
$target :: $plfile $pm_dep
\$(PERLRUNINST) $plfile $target
\$($perlrun) $plfile $target
MAKE_FRAG
}
......
......@@ -21,7 +21,7 @@ use vars qw(
use vars qw($Revision);
use strict;
$VERSION = '6.30_01';
$VERSION = '6.30';
($Revision = q$Revision: 4535 $) =~ /Revision:\s+(\S+)/;
@ISA = qw(Exporter);
......@@ -222,7 +222,7 @@ sub full_setup {
INSTALLMAN1DIR INSTALLMAN3DIR
INSTALLSITEMAN1DIR INSTALLSITEMAN3DIR
INSTALLVENDORMAN1DIR INSTALLVENDORMAN3DIR
INSTALLSCRIPT INSTALLSITESCRIPT INSTALLVENDORSCRIPT
INSTALLSCRIPT
PERL_LIB PERL_ARCHLIB
SITELIBEXP SITEARCHEXP
......@@ -1084,7 +1084,7 @@ INSTALLDIRS according to the following table:
INST_ARCHLIB INSTALLARCHLIB INSTALLSITEARCH INSTALLVENDORARCH
INST_LIB INSTALLPRIVLIB INSTALLSITELIB INSTALLVENDORLIB
INST_BIN INSTALLBIN INSTALLSITEBIN INSTALLVENDORBIN
INST_SCRIPT INSTALLSCRIPT INSTALLSITESCRIPT INSTALLVENDORSCRIPT
INST_SCRIPT INSTALLSCRIPT INSTALLSCRIPT INSTALLSCRIPT
INST_MAN1DIR INSTALLMAN1DIR INSTALLSITEMAN1DIR INSTALLVENDORMAN1DIR
INST_MAN3DIR INSTALLMAN3DIR INSTALLSITEMAN3DIR INSTALLVENDORMAN3DIR
......@@ -1545,7 +1545,7 @@ Defaults to $Config{installprivlib}.
=item INSTALLSCRIPT
Used by 'make install' which copies files from INST_SCRIPT to this
directory if INSTALLDIRS=perl.
directory.
=item INSTALLSITEARCH
......@@ -1572,11 +1572,6 @@ $(SITEPREFIX)/man/man$(MAN*EXT).
If set to 'none', no man pages will be installed.
=item INSTALLSITESCRIPT
Used by 'make install' which copies files from INST_SCRIPT to this
directory if INSTALLDIRS is set to site (default).
=item INSTALLVENDORARCH
Used by 'make install', which copies files from INST_ARCHLIB to this
......@@ -1601,11 +1596,6 @@ INSTALLDIRS=vendor. Defaults to $(VENDORPREFIX)/man/man$(MAN*EXT).
If set to 'none', no man pages will be installed.
=item INSTALLVENDORSCRIPT
Used by 'make install' which copies files from INST_SCRIPT to this
directory if INSTALLDIRS is set to is set to vendor.
=item INST_ARCHLIB
Same as INST_LIB for architecture dependent files.
......
......@@ -18,11 +18,9 @@ instmodsh - A shell to examine installed modules
=head1 DESCRIPTION
A little interface to ExtUtils::Installed to examine locally* installed modules,
A little interface to ExtUtils::Installed to examine installed modules,
validate your packlists and even create a tarball from an installed module.
*On Debian system, B<core> and B<vendor> modules are managed by C<dpkg>.
=head1 SEE ALSO
ExtUtils::Installed
......
......@@ -65,7 +65,9 @@ isa_ok( $mm, 'ExtUtils::MakeMaker' );
is( $mm->{NAME}, 'Big::Dummy', 'NAME' );
is( $mm->{VERSION}, 0.01, 'VERSION' );
is( $mm->{PERLPREFIX}, '$(PREFIX)', 'PERLPREFIX' );
my $config_prefix = $Config{installprefixexp} || $Config{installprefix} ||
$Config{prefixexp} || $Config{prefix};
is( $mm->{PERLPREFIX}, $config_prefix, 'PERLPREFIX' );
is( !!$mm->{PERL_CORE}, !!$ENV{PERL_CORE}, 'PERL_CORE' );
......
......@@ -16,7 +16,7 @@ BEGIN {
}
use strict;