Configure: make C++ build tests optional and configurable
Disabled by default
Fixes #8360
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8370)
(cherry picked from commit ac4033d658e4dc210ed4552b88069b57532ba3d7)
Richard Levitte
4 years ago
| 7 | 7 |
release branch.
|
| 8 | 8 |
|
| 9 | 9 |
Changes between 1.1.1b and 1.1.1c [xx XXX xxxx]
|
|
10 |
|
|
11 |
*) Added build tests for C++. These are generated files that only do one
|
|
12 |
thing, to include one public OpenSSL head file each. This tests that
|
|
13 |
the public header files can be usefully included in a C++ application.
|
|
14 |
|
|
15 |
This test isn't enabled by default. It can be enabled with the option
|
|
16 |
'enable-buildtest-c++'.
|
|
17 |
[Richard Levitte]
|
| 10 | 18 |
|
| 11 | 19 |
*) Change the default RSA, DSA and DH size to 2048 bit instead of 1024.
|
| 12 | 20 |
This changes the size when using the genpkey app when no size is given. It
|
| 331 | 331 |
"autoload-config",
|
| 332 | 332 |
"bf",
|
| 333 | 333 |
"blake2",
|
|
334 |
"buildtest-c++",
|
| 334 | 335 |
"camellia",
|
| 335 | 336 |
"capieng",
|
| 336 | 337 |
"cast",
|
|
| 431 | 432 |
|
| 432 | 433 |
our %disabled = ( # "what" => "comment"
|
| 433 | 434 |
"asan" => "default",
|
|
435 |
"buildtest-c++" => "default",
|
| 434 | 436 |
"crypto-mdebug" => "default",
|
| 435 | 437 |
"crypto-mdebug-backtrace" => "default",
|
| 436 | 438 |
"devcryptoeng" => "default",
|
|
| 1166 | 1168 |
foreach my $what (sort keys %disabled) {
|
| 1167 | 1169 |
$config{options} .= " no-$what";
|
| 1168 | 1170 |
|
| 1169 | |
if (!grep { $what eq $_ } ( 'threads', 'shared', 'pic',
|
|
1171 |
if (!grep { $what eq $_ } ( 'buildtest-c++', 'threads', 'shared', 'pic',
|
| 1170 | 1172 |
'dynamic-engine', 'makedepend',
|
| 1171 | 1173 |
'zlib-dynamic', 'zlib', 'sse2' )) {
|
| 1172 | 1174 |
(my $WHAT = uc $what) =~ s|-|_|g;
|
| 584 | 584 |
INCLUDE[buildtest_c_$name]=../include
|
| 585 | 585 |
DEPEND[buildtest_c_$name]=../libssl ../libcrypto
|
| 586 | 586 |
_____
|
| 587 | |
$OUT .= <<"_____" if $config{CXX};
|
|
587 |
$OUT .= <<"_____" if $config{CXX} && !$disabled{"buildtest-c++"};
|
| 588 | 588 |
|
| 589 | 589 |
PROGRAMS_NO_INST=buildtest_cc_$name
|
| 590 | 590 |
SOURCE[buildtest_cc_$name]=buildtest_$name.cc
|