Commit 7df0fc5
committed
build: move OPENSSL_API_COMPAT to else clause
Currently there are a number of deprecation warnings generated when
linking with OpenSSL 3.0, for example:
In file included from ../src/crypto/crypto_scrypt.h:6,
from ../src/crypto/crypto_scrypt.cc:1:
../src/crypto/crypto_util.h:64:37: warning:
‘void RSA_free(RSA*)’ is deprecated: Since OpenSSL 3.0
[-Wdeprecated-declarations]
64 | using RSAPointer = DeleteFnPtr<RSA, RSA_free>;
The reason for this is that I had placed the macro OPENSSL_API_COMPAT
inside of the node_shared_openssl="false" clause, but that was a
mistake and this macro should have gone into the else clause instead.
PR-URL: #38126
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent e96773b commit 7df0fc5
1 file changed
Lines changed: 4 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -326,9 +326,6 @@ | |||
| 326 | 326 | # For tests | |
| 327 | 327 | './deps/openssl/openssl.gyp:openssl-cli', | |
| 328 | 328 | ], | |
| 329 | - # Set 1.0.0 as the API compability level to avoid the | ||
| 330 | - # deprecation warnings when using OpenSSL 3.0. | ||
| 331 | - 'defines': ['OPENSSL_API_COMPAT=0x10000000L'], | ||
| 332 | 329 | 'conditions': [ | |
| 333 | 330 | # -force_load or --whole-archive are not applicable for | |
| 334 | 331 | # the static library | |
@@ -364,6 +361,10 @@ | |||
| 364 | 361 | ], | |
| 365 | 362 | }], | |
| 366 | 363 | ] | |
| 364 | + }, { | ||
| 365 | + # Set 1.0.0 as the API compability level to avoid the | ||
| 366 | + # deprecation warnings when using OpenSSL 3.0. | ||
| 367 | + 'defines': [ 'OPENSSL_API_COMPAT=0x10000000L', ] | ||
| 367 | 368 | }], | |
| 368 | 369 | [ 'openssl_quic=="true" and node_shared_ngtcp2=="false"', { | |
| 369 | 370 | 'dependencies': [ './deps/ngtcp2/ngtcp2.gyp:ngtcp2' ] | |
0 commit comments