[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  758baa3dc250f12b92b1bebe86ad114f25763c04 (commit)
      from  77a6be4dfc2ecf406c2559a99bea51317ce0f533 (commit)


- Log -----------------------------------------------------------------
commit 758baa3dc250f12b92b1bebe86ad114f25763c04
Author: Andy Polyakov <appro at openssl.org>
Date:   Fri Sep 9 23:45:57 2016 +0200

    Configure: impose ^X on whole build procedure.
    
    Traditionally Configure passed $ENV{PERL} to Makefile. But this
    resulted in ambiguilty as Configure script could be executed by
    interpreter different from one executing remaining scripts. Since
    we separate compile- and run-time interpreters with HASHBANGPERL
    variable, there is no reason to segment the build procedure.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 20 ++------------------
 INSTALL   |  3 +++
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/Configure b/Configure
index 445f928..f4a44cb 100755
--- a/Configure
+++ b/Configure
@@ -941,7 +941,7 @@ $config{cross_compile_prefix} = $ENV{'CROSS_COMPILE'}
 # Allow overriding the names of some tools.  USE WITH CARE
 # Note: only Unix cares about HASHBANGPERL...  that explains
 # the default string.
-$config{perl} =    $ENV{'PERL'}    || ($^O ne "VMS" ? $^X : "perl");
+$config{perl} =    ($^O ne "VMS" ? $^X : "perl");
 $config{hashbangperl} =
     $ENV{'HASHBANGPERL'}           || $ENV{'PERL'}     || "/usr/bin/env perl";
 $target{cc} =      $ENV{'CC'}      || $target{cc}      || "cc";
@@ -2019,11 +2019,10 @@ EOF
 print OUT "1;\n";
 close(OUT);
 
-my $perlvers = &get_perl_version();
 print "\n";
 print "PROCESSOR     =$config{processor}\n" if $config{processor};
 print "PERL          =$config{perl}\n";
-print "PERLVERSION   =$perlvers\n";
+print "PERLVERSION   =$Config{version} for $Config{archname}\n";
 print "HASHBANGPERL  =$config{hashbangperl}\n";
 print "CC            =$config{cross_compile_prefix}$target{cc}\n";
 print "CFLAG         =$target{cflags} $config{cflags}\n";
@@ -2384,21 +2383,6 @@ sub usage
 	exit(1);
 	}
 
-# Return the perl version.
-sub get_perl_version
-{
-    return "$Config{version} for $Config{archname}" if $config{perl} eq $^X;
-    my $l;
-    open my $FH, "$config{perl} -v|" || return "??unknown??";
-    while ( <$FH> ) {
-        chop;
-        $l .= $_;
-    }
-    close $FH;
-    $l =~ s/This is (.{1,70}).*/$1/;
-    return $l;
-}
-
 sub run_dofile
 {
     my $out = shift;
diff --git a/INSTALL b/INSTALL
index c63797a..e3f47db 100644
--- a/INSTALL
+++ b/INSTALL
@@ -812,6 +812,9 @@
 
  PERL
                 The name of the Perl executable to use when building OpenSSL.
+                This variable is used in config script only. Configure on the
+                other hand imposes the interpreter by which it itself was
+                executed on the whole build procedure.
 
  HASHBANGPERL
                 The command string for the Perl executable to insert in the