mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-18 13:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Stop having Unix defaults in Configure (partial)

Browse Source 
Default values belong in the DEFAULT config target template, in
Configurations/00-base-templates.conf.

This isn't a complete move, but takes care of the most blatant
examples.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5177)
This commit is contained in:
Richard Levitte 2018-01-27 12:13:35 +01:00
parent 5b18235a18
commit 085ed4f15a
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Configurations/00-base-templates.conf
View File

@ -38,6 +38,8 @@ my %targets=(
shared_rcflag => "",
shared_extension => "",
hashbangperl => "PERL", # Only Unix actually cares
build_scheme => [ "unified", "unix" ],
build_file => "Makefile",
},
@ -61,12 +63,19 @@ my %targets=(
inherit_from => [ "BASE_common" ],
template => 1,
ar => "ar",
arflags => "r",
cc => "cc",
lflags =>
sub { $withargs{zlib_lib} ? "-L".$withargs{zlib_lib} : () },
ex_libs =>
sub { !defined($disabled{zlib})
&& defined($disabled{"zlib-dynamic"})
? "-lz" : () },
hashbangperl => "/usr/bin/env perl", # Only Unix actually cares
ranlib => sub { which("$config{cross_compile_prefix}ranlib") ?
"\$(CROSS_COMPILE)ranlib" : "true"; },
rc => "windres",
build_scheme => [ "unified", "unix" ],
build_file => "Makefile",

12
Configure
View File

@ -576,16 +576,6 @@ my %user_to_target = (
LDFLAGS => 'lflags',
LDLIBS => 'ex_libs',
);
my %user_defaults = (
AR => 'ar',
ARFLAGS => [ 'r' ],
CC => 'cc',
CXX => 'c++',
HASHBANGPERL=> '/usr/bin/env perl', # Only Unix actually cares
RANLIB => sub { which("$config{cross_compile_prefix}ranlib") ?
"\$(CROSS_COMPILE)ranlib" : "true"; },
RC => 'windres',
);
$config{openssl_api_defines}=[];
$config{openssl_algorithm_defines}=[];
@ -1158,8 +1148,6 @@ foreach (keys %user) {
$config{$target_key} =
$mkvalue->($ref_type, $user{$_})
|| $mkvalue->($ref_type, $target{$target_key});
$config{$target_key} ||=$mkvalue->($ref_type, $user_defaults{$_})
if exists $user_defaults{$_};
if (defined $useradd{$_} && @{$useradd{$_}}) {
if (defined $config{$target_key}) {
push @{$config{$target_key}}, @{$useradd{$_}};