diff options
author | James M Snell <jasnell@gmail.com> | 2021-03-10 00:50:08 +0300 |
---|---|---|
committer | James M Snell <jasnell@gmail.com> | 2021-03-19 18:18:37 +0300 |
commit | 43f599b534e60933e86db4d9ad87dfd8750a0f06 (patch) | |
tree | 2925ba0ca7dfc39f120d44d163bacda9de115688 /configure.py | |
parent | 2b710c1413735ad8b497c5d6faf399d0f8c2c577 (diff) |
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 <jasnell@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/37682
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Diffstat (limited to 'configure.py')
-rwxr-xr-x | configure.py | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/configure.py b/configure.py index bb0f8019da6..b526507fee9 100755 --- a/configure.py +++ b/configure.py @@ -284,6 +284,50 @@ shared_optgroup.add_argument('--shared-nghttp2-libpath', dest='shared_nghttp2_libpath', help='a directory to search for the shared nghttp2 DLLs') +shared_optgroup.add_argument('--shared-nghttp3', + action='store_true', + dest='shared_nghttp3', + default=None, + help='link to a shared nghttp3 DLL instead of static linking') + +shared_optgroup.add_argument('--shared-nghttp3-includes', + action='store', + dest='shared_nghttp3_includes', + help='directory containing nghttp3 header files') + +shared_optgroup.add_argument('--shared-nghttp3-libname', + action='store', + dest='shared_nghttp3_libname', + default='nghttp3', + help='alternative lib name to link to [default: %(default)s]') + +shared_optgroup.add_argument('--shared-nghttp3-libpath', + action='store', + dest='shared_nghttp3_libpath', + help='a directory to search for the shared nghttp3 DLLs') + +shared_optgroup.add_argument('--shared-ngtcp2', + action='store_true', + dest='shared_ngtcp2', + default=None, + help='link to a shared ngtcp2 DLL instead of static linking') + +shared_optgroup.add_argument('--shared-ngtcp2-includes', + action='store', + dest='shared_ngtcp2_includes', + help='directory containing ngtcp2 header files') + +shared_optgroup.add_argument('--shared-ngtcp2-libname', + action='store', + dest='shared_ngtcp2_libname', + default='ngtcp2', + help='alternative lib name to link to [default: %(default)s]') + +shared_optgroup.add_argument('--shared-ngtcp2-libpath', + action='store', + dest='shared_ngtcp2_libpath', + help='a directory to search for the shared tcp2 DLLs') + shared_optgroup.add_argument('--shared-openssl', action='store_true', dest='shared_openssl', @@ -1347,6 +1391,8 @@ def configure_openssl(o): variables = o['variables'] variables['node_use_openssl'] = b(not options.without_ssl) variables['node_shared_openssl'] = b(options.shared_openssl) + variables['node_shared_ngtcp2'] = b(options.shared_ngtcp2) + variables['node_shared_nghttp3'] = b(options.shared_nghttp3) variables['openssl_is_fips'] = b(options.openssl_is_fips) variables['openssl_fips'] = '' variables['openssl_quic'] = b(True) @@ -1836,6 +1882,8 @@ configure_library('libuv', output) configure_library('brotli', output, pkgname=['libbrotlidec', 'libbrotlienc']) configure_library('cares', output, pkgname='libcares') configure_library('nghttp2', output, pkgname='libnghttp2') +configure_library('nghttp3', output, pkgname='libnghttp3') +configure_library('ngtcp2', output, pkgname='libngtcp2') configure_v8(output) configure_openssl(output) configure_intl(output) |