Commit 986ef6f
build: add checks for openssl configure options
Currently it is possible to configure using --without-ssl and
--shared-openssl/--openssl-no-asm/openssl-fips without an error
occuring.
The commit add check for these combinations:
$ ./configure --without-ssl --shared-openssl
Error: --without-ssl is incompatible with --shared-openssl
$ ./configure --without-ssl --openssl-no-asm
Error: --without-ssl is incompatible with --openssl-no-asm
$ ./configure --without-ssl --openssl-fips=dummy
Error: --without-ssl is incompatible with --openssl-fips
PR-URL: #12175
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>1 parent c2c467e commit 986ef6f
1 file changed
Lines changed: 9 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -965,6 +965,15 @@ def configure_openssl(o): | |||
| 965 | 965 | ||
| 966 | 966 | ||
| 967 | 967 | if options.without_ssl: | |
| 968 | + def without_ssl_error(option): | ||
| 969 | + print('Error: --without-ssl is incompatible with %s' % option) | ||
| 970 | + exit(1) | ||
| 971 | + if options.shared_openssl: | ||
| 972 | + without_ssl_error('--shared-openssl') | ||
| 973 | + if options.openssl_no_asm: | ||
| 974 | + without_ssl_error('--openssl-no-asm') | ||
| 975 | + if options.openssl_fips: | ||
| 976 | + without_ssl_error('--openssl-fips') | ||
| 968 | 977 | return | |
| 969 | 978 | configure_library('openssl', o) | |
| 970 | 979 | ||
0 commit comments