Expand %Config variables and %ENV variables only if

so requested during build time using the
PERL_BUILD_EXPAND_CONFIG_VARS and PERL_BUILD_EXPAND_ENV_VARS.
Not expanding makes relocating distributions easier.

p4raw-id: //depot/perl@7522

1 files changed, 58 insertions, 37 deletions

diff --git a/ext/DynaLoader/DynaLoader_pm.PL b/ext/DynaLoader/DynaLoader_pm.PL
index 0d4e8cd463..4bd36a0cac 100644
--- a/ext/DynaLoader/DynaLoader_pm.PL
+++ b/ext/DynaLoader/DynaLoader_pm.PL
@@ -1,4 +1,3 @@
-
 use Config;
 
 sub to_string {
@@ -12,7 +11,7 @@ unlink "DynaLoader.pm" if -f "DynaLoader.pm";
 open OUT, ">DynaLoader.pm" or die $!;
 print OUT <<'EOT';
 
-# Generated from DynaLoader.pm.PL (resolved %Config::Config values)
+# Generated from DynaLoader.pm.PL
 
 package DynaLoader;
 
@@ -72,7 +71,6 @@ print OUT <<'EOT';
 # See dl_expandspec() for more details. Should be harmless but
 # inefficient to define on systems that don't need it.
 $do_expand = $Is_VMS = $^O eq 'VMS';
-$Is_MacOS  = $^O eq 'MacOS';
 
 @dl_require_symbols = ();       # names of symbols we need
 @dl_resolve_using   = ();       # names of files to link with
@@ -83,54 +81,77 @@ $Is_MacOS  = $^O eq 'MacOS';
 # This is a fix to support DLD's unfortunate desire to relink -lc
 @dl_resolve_using = dl_findfile('-lc') if $dlsrc eq "dl_dld.xs";
 
-# Initialise @dl_library_path with the 'standard' library path
-# for this platform as determined by Configure
+EOT
 
-# push(@dl_library_path, split(' ', $Config::Config{'libpth'});
+my $cfg_dl_library_path = <<'EOT';
+push(@dl_library_path, split(' ', $Config::Config{'libpth'}));
 EOT
 
-print OUT "push(\@dl_library_path, split(' ', ",
-          to_string($Config::Config{'libpth'}), "));\n";
+sub dquoted_comma_list {
+    join(", ", map {qq("$_")} @_);
+}
+
+if ($ENV{PERL_BUILD_EXPAND_CONFIG_VARS}) {
+    eval $cfg_dl_library_path;
+    if (!$ENV{PERL_BUILD_EXPAND_ENV_VARS}) {
+        my $dl_library_path = dquoted_comma_list(@dl_library_path);
+        print OUT <<EOT;
+# This list has been expanded in Perl build time.
 
-print OUT <<'EOT';
+\@dl_library_path = ($dl_library_path);
+
+EOT
+    }
+}
+else {
+    print OUT <<EOT;
+# Initialise \@dl_library_path with the 'standard' library path
+# for this platform as determined by Configure.
+
+$cfg_dl_library_path
+
+EOT
+}
 
-# Add to @dl_library_path any extra directories we can gather
-# from environment variables.
-if ($Is_MacOS) {
-    push(@dl_library_path, split(/,/, $ENV{LD_LIBRARY_PATH}))
-   	if exists $ENV{LD_LIBRARY_PATH};
-} else {
-#     push(@dl_library_path, split(/:/, $ENV{$Config::Config{ldlibpthname}}))
-#     	if exists      $Config::Config{ldlibpthname}        &&
-#                        $Config::Config{ldlibpthname}  ne '' &&
-#                 exists $ENV{$Config::Config{ldlibpthname}}       ;;
-#     push(@dl_library_path, split(/:/, $ENV{$Config::Config{ldlibpthname}}))
-#     	if exists      $Config::Config{ldlibpthname}        &&
-#                        $Config::Config{ldlibpthname}  ne '' &&
-#                 exists $ENV{$Config::Config{ldlibpthname}}       ;;
+my $env_dl_library_path = <<'EOT';
+if (exists  $Config::Config{ldlibpthname}        &&
+	    $Config::Config{ldlibpthname}  ne '' &&
+    exists $ENV{$Config::Config{ldlibpthname}}) {
+    my $ldlibpthname = $Config::Config{ldlibpthname};
+    my $ldlibpth     = $ENV{$ldlibpthname};
+    my $pthsep       = $Config{path_sep};
+    push(@dl_library_path, split(/$pthsep/, $ldlibpth));
 # E.g. HP-UX supports both its native SHLIB_PATH *and* LD_LIBRARY_PATH.
-# push(@dl_library_path, split(/:/, $ENV{LD_LIBRARY_PATH}))
-#     if exists $ENV{LD_LIBRARY_PATH};
+    if ($ldlibpthname ne 'LD_LIBRARY_PATH' && exists $ENV{LD_LIBRARY_PATH}) {
+        push(@dl_library_path, split(/$pthsep/, $ENV{LD_LIBRARY_PATH}))
+    }
+}
 EOT
 
-# Make a list of paths to print.
-# HP-UX supports both its native SHLIB_PATH *and* LD_LIBRARY_PATH,
-# but for other OSes no point pushing 'LD_LIBRARY_PATH' twice.
-my @ldlibpthname = 'LD_LIBRARY_PATH';
-if (exists $Config::Config{ldlibpthname}
-    and length $Config::Config{ldlibpthname}
-    and $Config::Config{ldlibpthname} ne 'LD_LIBRARY_PATH') {
-    unshift @ldlibpthname, $Config::Config{ldlibpthname};
+if ($ENV{PERL_BUILD_EXPAND_CONFIG_VARS} && $ENV{PERL_BUILD_EXPAND_ENV_VARS}) {
+    eval $env_dl_library_path;
 }
+else {
+    print OUT <<EOT;
+# Add to \@dl_library_path any extra directories we can gather from environment
+# during runtime.
+
+$env_dl_library_path
 
-foreach (@ldlibpthname) {
-    print OUT "    push(\@dl_library_path, split(/:/, \$ENV{", to_string($_),
-		  "}))\n\tif exists \$ENV{", to_string($_), "};\n";
+EOT
 }
 
-print OUT <<'EOT';
+if ($ENV{PERL_BUILD_EXPAND_CONFIG_VARS} && $ENV{PERL_BUILD_EXPAND_ENV_VARS}) {
+    my $dl_library_path = dquoted_comma_list(@dl_library_path);
+    print OUT <<EOT;
+# This list has been expanded in Perl build time.
+
+\@dl_library_path = ($dl_library_path);
+
+EOT
 }
 
+print OUT <<'EOT';
 # No prizes for guessing why we don't say 'bootstrap DynaLoader;' here.
 # NOTE: All dl_*.xs (including dl_none.xs) define a dl_error() XSUB
 boot_DynaLoader('DynaLoader') if defined(&boot_DynaLoader) &&