wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert merge error

Browse source 
There are two versions of print_table_entry() in Configure.  Remove
the older.

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2016-01-25 18:20:23 +01:00
parent 4f2eec60c2
commit 971a725be4
1 changed files with 0 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
Configure
View file

@ -1842,111 +1842,6 @@ sub which
}
}
sub print_table_entry
{
my $target = shift;
my %target = resolve_config($target);
my $type = shift;
# Don't print the templates
return if $target{template};
if ($type eq "TABLE") {
print <<"EOF"
*** $target
\$cc = $target{cc}
\$cflags = $target{cflags}
\$debug_cflags = $target{debug_cflags}
\$release_cflags = $target{release_cflags}
\$unistd = $target{unistd}
\$thread_cflag = $target{thread_cflag}
\$sys_id = $target{sys_id}
\$lflags = $target{lflags}
\$debug_lflags = $target{debug_lflags}
\$release_lflags = $target{release_lflags}
\$bn_ops = $target{bn_ops}
\$cpuid_obj = $target{cpuid_obj}
\$bn_obj = $target{bn_obj}
\$ec_obj = $target{ec_obj}
\$des_obj = $target{des_obj}
\$aes_obj = $target{aes_obj}
\$bf_obj = $target{bf_obj}
\$md5_obj = $target{md5_obj}
\$sha1_obj = $target{sha1_obj}
\$cast_obj = $target{cast_obj}
\$rc4_obj = $target{rc4_obj}
\$rmd160_obj = $target{rmd160_obj}
\$rc5_obj = $target{rc5_obj}
\$wp_obj = $target{wp_obj}
\$cmll_obj = $target{cmll_obj}
\$modes_obj = $target{modes_obj}
\$engines_obj = $target{engines_obj}
\$chacha_obj = $target{chacha_obj}
\$poly1305_obj = $target{poly1305_obj}
\$perlasm_scheme = $target{perlasm_scheme}
\$dso_scheme = $target{dso_scheme}
\$shared_target= $target{shared_target}
\$shared_cflag = $target{shared_cflag}
\$shared_ldflag = $target{shared_ldflag}
\$shared_extension = $target{shared_extension}
\$ranlib = $target{ranlib}
\$arflags = $target{arflags}
\$multilib = $target{multilib}
EOF
} elsif ($type eq "HASH") {
my @sequence = (
"cc",
"cflags",
"debug_cflags",
"release_cflags",
"unistd",
"thread_cflag",
"sys_id",
"lflags",
"debug_lflags",
"release_lflags",
"bn_ops",
"cpuid_obj",
"bn_obj",
"ec_obj",
"des_obj",
"aes_obj",
"bf_obj",
"md5_obj",
"sha1_obj",
"cast_obj",
"rc4_obj",
"rmd160_obj",
"rc5_obj",
"wp_obj",
"cmll_obj",
"modes_obj",
"engines_obj",
"chacha_obj",
"poly1305_obj",
"perlasm_scheme",
"dso_scheme",
"shared_target",
"shared_cflag",
"shared_ldflag",
"shared_extension",
"ranlib",
"arflags",
"multilib",
);
my $largest =
length((sort { length($a) <=> length($b) } @sequence)[-1]);
print " '$target' => {\n";
foreach (@sequence) {
if ($target{$_}) {
print " '",$_,"'"," " x ($largest - length($_))," => '",$target{$_},"',\n";
}
}
print " },\n";
}
}
sub quotify {
my %processors = (
perl => sub { my $x = shift;