root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Expose %disables to the perl fragments in build.info files. 

This way, we can use them as conditions instead of relying to more or
less obscure aliases in %config or variables directly in Configure.

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2016-02-22 13:45:46 +01:00
parent d784bcffa3
commit 9e04edf2f3
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Configure
View File

@ -334,20 +334,20 @@ my @deprecated_disablables = (
# All of the following is disabled by default (RC5 was enabled before 0.9.8): # All of the following is disabled by default (RC5 was enabled before 0.9.8):
my %disabled = ( # "what" => "comment" our %disabled = ( # "what" => "comment"
"ec_nistp_64_gcc_128" => "default", "ec_nistp_64_gcc_128" => "default",
"egd" => "default", "egd" => "default",
"md2" => "default", "md2" => "default",
"rc5" => "default", "rc5" => "default",
"sctp" => "default", "sctp" => "default",
"shared" => "default", "shared" => "default",
"ssl-trace" => "default", "ssl-trace" => "default",
"static-engine" => "default", "static-engine" => "default",
"unit-test" => "default", "unit-test" => "default",
"zlib" => "default", "zlib" => "default",
"crypto-mdebug" => "default", "crypto-mdebug" => "default",
"heartbeats" => "default", "heartbeats" => "default",
); );
# Note: => pair form used for aesthetics, not to truly make a hash table # Note: => pair form used for aesthetics, not to truly make a hash table
my @disable_cascades = ( my @disable_cascades = (
@ -1301,6 +1301,7 @@ if ($builder eq "unified") {
split /^/m, split /^/m,
$template->fill_in(HASH => { config => \%config, $template->fill_in(HASH => { config => \%config,
target => \%target, target => \%target,
disabled => \%disabled,
builddir => abs2rel($buildd, $blddir), builddir => abs2rel($buildd, $blddir),
sourcedir => abs2rel($sourced, $blddir), sourcedir => abs2rel($sourced, $blddir),
buildtop => abs2rel($blddir, $blddir), buildtop => abs2rel($blddir, $blddir),