提交 ab185b60 编写于 作者: B Bodo Möller

It seems that Configure revision 1.404 broke "make depend" by hiding

from it which algorithms were disabled.  With these new changes,
"make depend" will properly take into account algorithms that are skipped.
上级 16420007
...@@ -611,6 +611,10 @@ my %disabled = ( # "what" => "comment" ...@@ -611,6 +611,10 @@ my %disabled = ( # "what" => "comment"
# To remove something from %disabled, use e.g. "enable-rc5". # To remove something from %disabled, use e.g. "enable-rc5".
# For symmetry, "disable-..." is a synonym for "no-...". # For symmetry, "disable-..." is a synonym for "no-...".
# This is what $depflags will look like with the above default:
my $default_depflags = "-DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 ";
my $no_sse2=0; my $no_sse2=0;
&usage if ($#ARGV < 0); &usage if ($#ARGV < 0);
...@@ -891,6 +895,8 @@ foreach (sort (keys %disabled)) ...@@ -891,6 +895,8 @@ foreach (sort (keys %disabled))
{ {
push @skip, $algo; push @skip, $algo;
print " (skip dir)"; print " (skip dir)";
$depflags .="-DOPENSSL_NO_$ALGO ";
} }
} }
} }
...@@ -1531,7 +1537,7 @@ EOF ...@@ -1531,7 +1537,7 @@ EOF
my $make_command = "make -f Makefile.ssl PERL=\'$perl\'"; my $make_command = "make -f Makefile.ssl PERL=\'$perl\'";
my $make_targets = ""; my $make_targets = "";
$make_targets .= " links" if $symlink; $make_targets .= " links" if $symlink;
$make_targets .= " depend" if $depflags ne "" && $make_depend; $make_targets .= " depend" if $depflags ne $default_depflags && $make_depend;
$make_targets .= " gentests" if $symlink; $make_targets .= " gentests" if $symlink;
(system $make_command.$make_targets) == 0 or exit $? (system $make_command.$make_targets) == 0 or exit $?
if $make_targets ne ""; if $make_targets ne "";
...@@ -1543,11 +1549,11 @@ EOF ...@@ -1543,11 +1549,11 @@ EOF
&dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";'); &dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";');
&dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s'); &dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s');
} }
if ($depflags ne "" && !$make_depend) { if ($depflags ne $default_depflags && !$make_depend) {
print <<EOF; print <<EOF;
Since you've disabled at least one algorithm, you need to do the following Since you've disabled or enabled at least one algorithm, you need to do
before building: the following before building:
make depend make depend
EOF EOF
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册