This fix also separates the FLOSS from SPT configurations which should not
have been conflated in the 3.0 series.
Related-to: #22588
Signed-off-by: Randall S. Becker <randall.becker@nexbridge.ca>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22697)
(cherry picked from commit
e3c38759608bb48d70ddfdaa1c88bcd86069952d)
},
'nonstop-model-spt' => {
template => 1,
+ cflags => add('-Wnowarn=140'),
defines => ['_SPT_MODEL_',
- '_REENTRANT', '_ENABLE_FLOSS_THREADS'],
+ 'SPT_THREAD_AWARE_NONBLOCK',
+ '_REENTRANT'],
ex_libs => '-lspt',
},
# disable threads.
'nonstop-model-floss' => {
template => 1,
- defines => ['OPENSSL_TANDEM_FLOSS'],
+ defines => ['OPENSSL_TANDEM_FLOSS', '_ENABLE_FLOSS_THREADS'],
includes => ['/usr/local/include'],
ex_libs => '-lfloss',
},