mirror of
https://github.com/openssl/openssl.git
synced 2025-02-17 14:32:04 +08:00
config, Configure: move the check of removed crypto/ sub-systems
The 'config' script checked for a bunch of crypto/ sub-system directories, and added 'no-' options if they weren't there. We move it to 'Configure' in an effort to simplify 'config' for further work. Note: this is pretty much a historical thing. In modern OpenSSL, it's much simpler to edit the SUBDIRS statement in crypto/build.info. However, it's been claimed the there are those who still remove some of these sub-system sources. Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/11217)
This commit is contained in:
parent
6caf63ec48
commit
b16654a281
13
Configure
13
Configure
@ -265,6 +265,19 @@ if (grep /^reconf(igure)?$/, @argvcopy) {
|
||||
|
||||
$config{perlargv} = [ @argvcopy ];
|
||||
|
||||
# Historical: if known directories in crypto/ have been removed, it means
|
||||
# that those sub-systems are disabled.
|
||||
# (the other option would be to removed them from the SUBDIRS statement in
|
||||
# crypto/build.info)
|
||||
# We reverse the input list for cosmetic purely reasons, to compensate that
|
||||
# 'unshift' adds at the front of the list (i.e. in reverse input order).
|
||||
foreach ( reverse sort( 'aes', 'aria', 'bf', 'camellia', 'cast', 'des', 'dh',
|
||||
'dsa', 'ec', 'hmac', 'idea', 'md2', 'md5', 'mdc2',
|
||||
'rc2', 'rc4', 'rc5', 'ripemd', 'rsa', 'seed', 'sha',
|
||||
'sm2', 'sm3', 'sm4') ) {
|
||||
unshift @argvcopy, "no-$_" if ! -d catdir($srcdir, 'crypto', $_);
|
||||
}
|
||||
|
||||
# Collect version numbers
|
||||
my %version = ();
|
||||
|
||||
|
8
config
8
config
@ -847,14 +847,6 @@ case "$GUESSOS" in
|
||||
i386-*) options="$options 386" ;;
|
||||
esac
|
||||
|
||||
for i in aes aria bf camellia cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa seed sha sm2 sm3 sm4
|
||||
do
|
||||
if [ ! -d $THERE/crypto/$i ]
|
||||
then
|
||||
options="$options no-$i"
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -z "$OUT" ]; then
|
||||
OUT="$CC"
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user