Change 27491 by [EMAIL PROTECTED] on 2006/03/13 23:13:23
Somewhat less shaky relocatable @INC support. You can install things
to the current location of the perl tree, move it, install more things,
move it again, lather rinse repeat.
Configure with -Duserelocatableinc
Affected files ...
... //depot/perl/Configure#612 edit
... //depot/perl/configpm#77 edit
... //depot/perl/installperl#136 edit
Differences ...
==== //depot/perl/Configure#612 (xtext) ====
Index: perl/Configure
--- perl/Configure#611~27490~ 2006-03-13 12:49:55.000000000 -0800
+++ perl/Configure 2006-03-13 15:13:23.000000000 -0800
@@ -1161,6 +1161,7 @@
runnm=''
usenm=''
useperlio=''
+initialinstalllocation=''
userelocatableinc=''
usesocks=''
d_oldpthreads=''
@@ -6031,8 +6032,12 @@
: Default prefix is now "up one level from where the binaries are"
case "$userelocatableinc" in
-$define|true|[yY]*) prefix=".../.."
- prefixexp=".../..";;
+$define|true|[yY]*) initialinstalllocation="$binexp"
+ bin=".../"
+ binexp=".../"
+ prefix=".../.."
+ prefixexp=".../.."
+ installprefixexp=".../..";;
esac
@@ -22063,6 +22068,7 @@
useperlio='$useperlio'
useposix='$useposix'
usereentrant='$usereentrant'
+initialinstalllocation="$initialinstalllocation"
userelocatableinc='$userelocatableinc'
usesfio='$usesfio'
useshrplib='$useshrplib'
==== //depot/perl/configpm#77 (xtext) ====
Index: perl/configpm
--- perl/configpm#76~27490~ 2006-03-13 12:49:55.000000000 -0800
+++ perl/configpm 2006-03-13 15:13:23.000000000 -0800
@@ -326,7 +326,34 @@
siteprefixexp
sitelib_stem
- vendorlib_stem)) {
+ vendorlib_stem
+
+ installarchlib
+ installhtml1dir
+ installhtml3dir
+ installman1dir
+ installman3dir
+ installprefix
+ installprefixexp
+ installprivlib
+ installscript
+ installsitearch
+ installsitebin
+ installsitehtml1dir
+ installsitehtml3dir
+ installsitelib
+ installsiteman1dir
+ installsiteman3dir
+ installsitescript
+ installvendorarch
+ installvendorbin
+ installvendorhtml1dir
+ installvendorhtml3dir
+ installvendorlib
+ installvendorman1dir
+ installvendorman3dir
+ installvendorscript
+ )) {
push @need_relocation, $what if fetch_string({}, $what) =~ m!^\.\.\./!;
}
}
==== //depot/perl/installperl#136 (xtext) ====
Index: perl/installperl
--- perl/installperl#135~27389~ 2006-03-06 08:09:50.000000000 -0800
+++ perl/installperl 2006-03-13 15:13:23.000000000 -0800
@@ -7,6 +7,31 @@
$ENV{PERL5LIB} = 'lib';
}
+BEGIN {
+ use Config;
+ if ($Config{userelocatableinc}) {
+ # This might be a considered a hack. Need to get information about the
+ # configuration from Config.pm *before* Config.pm expands any .../
+ # prefixes.
+ #
+ # So we set $^X to pretend that we're the already installed perl, so
+ # Config.pm doesits ... expansion off that location.
+
+ my $location = $Config{initialinstalllocation};
+ die <<'OS' unless defined $location;
+$Config{initialinstalllocation} is not defined - can't install a relocatable
+perl without this.
+OS
+ $^X = "$location/perl";
+ # And then remove all trace of ever having loaded Config.pm, so that
+ # it will reload with the revised $^X
+ undef %Config::;
+ delete $INC{"Config.pm"};
+ delete $INC{"Config_heavy.pl"};
+ # You never saw us. We weren't here.
+ }
+}
+
use strict;
my ($Is_VMS, $Is_W32, $Is_OS2, $Is_Cygwin, $Is_Darwin,
$nonono, $dostrip, $versiononly, $silent, $verbose, $force,
End of Patch.
