From 43f599b534e60933e86db4d9ad87dfd8750a0f06 Mon Sep 17 00:00:00 2001 From: James M Snell Date: Tue, 9 Mar 2021 13:50:08 -0800 Subject: deps: add ngtcp2 and nghttp3 Reintroduces the ngtcp2 and nghttp3 dependencies, building those by default if the vendored-in openssl (with QUIC support) is used or the shared openssl defines `OPENSSL_INFO_QUIC`. Upates the version metadata to reflect whether ngtcp2 and nghttp3 are present. ngtcp2 as of https://github.com/ngtcp2/ngtcp2/commit/2381f7f7b633602d83ad3de997153df730b1f649 nghttp3 as of https://github.com/ngtcp2/nghttp3/commit/66ad30f0a8f5164f87fbc83b37628f8f6d9ba608 Signed-off-by: James M Snell PR-URL: https://github.com/nodejs/node/pull/37682 Reviewed-By: Daniel Bevenius Reviewed-By: Matteo Collina --- node.gypi | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'node.gypi') diff --git a/node.gypi b/node.gypi index f9dba2d4bdd..dde4f8332d5 100644 --- a/node.gypi +++ b/node.gypi @@ -326,6 +326,9 @@ # For tests './deps/openssl/openssl.gyp:openssl-cli', ], + # Set 1.0.0 as the API compability level to avoid the + # deprecation warnings when using OpenSSL 3.0. + 'defines': ['OPENSSL_API_COMPAT=0x10000000L'], 'conditions': [ # -force_load or --whole-archive are not applicable for # the static library @@ -360,16 +363,17 @@ }], ], }], - ], - }, { - # Set 1.0.0 as the API compability level to avoid the - # deprecation warnings when using OpenSSL 3.0. - 'defines': ['OPENSSL_API_COMPAT=0x10000000L'], - }]] - + ] + }], + [ 'openssl_quic=="true" and node_shared_ngtcp2=="false"', { + 'dependencies': [ './deps/ngtcp2/ngtcp2.gyp:ngtcp2' ] + }], + [ 'openssl_quic=="true" and node_shared_nghttp3=="false"', { + 'dependencies': [ './deps/ngtcp2/ngtcp2.gyp:nghttp3' ] + }] + ] }, { 'defines': [ 'HAVE_OPENSSL=0' ] }], - ], } -- cgit v1.2.3