mirror of https://github.com/openssl/openssl
Keep supporting the env / make variable PERL
OpenSSL 1.1.0 supports the use of this environment variable for passing to the build files. For the sake of backward compatibility, we keep it. Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Paul Dale <paul.dale@oracle.com> Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de> (Merged from https://github.com/openssl/openssl/pull/6668)
This commit is contained in:
parent
b7b13c7ac8
commit
9e26532295
|
@ -180,7 +180,7 @@ CFLAGS={- join('', @{$config{CFLAGS}}) -}
|
||||||
LDFLAGS={- join('', @{$config{LFLAGS}}) -}
|
LDFLAGS={- join('', @{$config{LFLAGS}}) -}
|
||||||
EX_LIBS={- join('', map { ",$_" } @{$config{LDLIBS}}) -}
|
EX_LIBS={- join('', map { ",$_" } @{$config{LDLIBS}}) -}
|
||||||
|
|
||||||
PERL={- $config{perl} -}
|
PERL={- $config{PERL} -}
|
||||||
|
|
||||||
AS={- $config{AS} -}
|
AS={- $config{AS} -}
|
||||||
ASFLAGS={- join(' ', @{$config{ASFLAGS}}) -}
|
ASFLAGS={- join(' ', @{$config{ASFLAGS}}) -}
|
||||||
|
|
|
@ -212,7 +212,7 @@ EX_LIBS= {- join(' ', @{$config{LDLIBS}}) -}
|
||||||
|
|
||||||
MAKEDEPEND={- $config{makedepprog} -}
|
MAKEDEPEND={- $config{makedepprog} -}
|
||||||
|
|
||||||
PERL={- $config{perl} -}
|
PERL={- $config{PERL} -}
|
||||||
|
|
||||||
AR=$(CROSS_COMPILE){- $config{AR} -}
|
AR=$(CROSS_COMPILE){- $config{AR} -}
|
||||||
ARFLAGS= {- join(' ', @{$config{ARFLAGS}}) -}
|
ARFLAGS= {- join(' ', @{$config{ARFLAGS}}) -}
|
||||||
|
|
|
@ -173,7 +173,7 @@ LD={- $config{LD} -}
|
||||||
LDFLAGS={- join(' ', @{$config{LDFLAGS}}) -}
|
LDFLAGS={- join(' ', @{$config{LDFLAGS}}) -}
|
||||||
EX_LIBS={- join(' ', @{$config{LDLIBS}}) -}
|
EX_LIBS={- join(' ', @{$config{LDLIBS}}) -}
|
||||||
|
|
||||||
PERL={- $config{perl} -}
|
PERL={- $config{PERL} -}
|
||||||
|
|
||||||
AR={- $config{AR} -}
|
AR={- $config{AR} -}
|
||||||
ARFLAGS= {- join(' ', @{$config{ARFLAGS}}) -}
|
ARFLAGS= {- join(' ', @{$config{ARFLAGS}}) -}
|
||||||
|
|
11
Configure
11
Configure
|
@ -553,6 +553,7 @@ my %user = (
|
||||||
LDLIBS => [], # -l
|
LDLIBS => [], # -l
|
||||||
MT => undef,
|
MT => undef,
|
||||||
MTFLAGS => [],
|
MTFLAGS => [],
|
||||||
|
PERL => env('PERL') || ($^O ne "VMS" ? $^X : "perl"),
|
||||||
RANLIB => env('RANLIB'),
|
RANLIB => env('RANLIB'),
|
||||||
RC => env('RC') || env('WINDRES'),
|
RC => env('RC') || env('WINDRES'),
|
||||||
RCFLAGS => [],
|
RCFLAGS => [],
|
||||||
|
@ -1117,10 +1118,8 @@ $target{dso_extension}//=$target{shared_extension_simple};
|
||||||
($target{shared_import_extension}=$target{shared_extension_simple}.".a")
|
($target{shared_import_extension}=$target{shared_extension_simple}.".a")
|
||||||
if ($config{target} =~ /^(?:Cygwin|mingw)/);
|
if ($config{target} =~ /^(?:Cygwin|mingw)/);
|
||||||
|
|
||||||
# Allow overriding the names of some tools. USE WITH CARE
|
# Fill %config with values from %user, and in case those are undefined or
|
||||||
# Note: only Unix cares about HASHBANGPERL... that explains
|
# empty, use values from %target (acting as a default).
|
||||||
# the default string.
|
|
||||||
$config{perl} = ($^O ne "VMS" ? $^X : "perl");
|
|
||||||
foreach (keys %user) {
|
foreach (keys %user) {
|
||||||
my $ref_type = ref $user{$_};
|
my $ref_type = ref $user{$_};
|
||||||
|
|
||||||
|
@ -2459,7 +2458,7 @@ _____
|
||||||
if ($dump || $cmdline) {
|
if ($dump || $cmdline) {
|
||||||
print "\nCommand line (with current working directory = $here):\n\n";
|
print "\nCommand line (with current working directory = $here):\n\n";
|
||||||
print ' ',join(' ',
|
print ' ',join(' ',
|
||||||
$config{perl},
|
$config{PERL},
|
||||||
catfile($config{sourcedir}, 'Configure'),
|
catfile($config{sourcedir}, 'Configure'),
|
||||||
@{$config{perlargv}}), "\n";
|
@{$config{perlargv}}), "\n";
|
||||||
print "\nPerl information:\n\n";
|
print "\nPerl information:\n\n";
|
||||||
|
@ -3065,7 +3064,7 @@ sub run_dofile
|
||||||
foreach (@templates) {
|
foreach (@templates) {
|
||||||
die "Can't open $_, $!" unless -f $_;
|
die "Can't open $_, $!" unless -f $_;
|
||||||
}
|
}
|
||||||
my $perlcmd = (quotify("maybeshell", $config{perl}))[0];
|
my $perlcmd = (quotify("maybeshell", $config{PERL}))[0];
|
||||||
my $cmd = "$perlcmd \"-I.\" \"-Mconfigdata\" \"$dofile\" -o\"Configure\" \"".join("\" \"",@templates)."\" > \"$out.new\"";
|
my $cmd = "$perlcmd \"-I.\" \"-Mconfigdata\" \"$dofile\" -o\"Configure\" \"".join("\" \"",@templates)."\" > \"$out.new\"";
|
||||||
#print STDERR "DEBUG[run_dofile]: \$cmd = $cmd\n";
|
#print STDERR "DEBUG[run_dofile]: \$cmd = $cmd\n";
|
||||||
system($cmd);
|
system($cmd);
|
||||||
|
|
Loading…
Reference in New Issue