diff options
| author | James M Snell <jasnell@gmail.com> | 2021-03-10 00:50:08 +0300 |
|---|---|---|
| committer | Ruy Adorno <ruyadorno@hotmail.com> | 2021-03-24 04:15:02 +0300 |
| commit | 9e6aa190e39163bdc89b2ce98d28eeb36b122e23 (patch) | |
| tree | dda85eb305e6badb2eca5a336257ad33cdc94878 /tools | |
| parent | 2227aa61ead2dadedce2e899f066550d792e646a (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 'tools')
| -rw-r--r-- | tools/getsharedopensslhasquic.py | 19 | ||||
| -rwxr-xr-x | tools/license-builder.sh | 2 |
2 files changed, 12 insertions, 9 deletions
diff --git a/tools/getsharedopensslhasquic.py b/tools/getsharedopensslhasquic.py index 549a0eacdae..00d4b4b424e 100644 --- a/tools/getsharedopensslhasquic.py +++ b/tools/getsharedopensslhasquic.py @@ -3,17 +3,18 @@ import os import re def get_has_quic(include_path): - openssl_crypto_h = os.path.join( - include_path, - 'openssl', - 'crypto.h') + if include_path: + openssl_crypto_h = os.path.join( + include_path, + 'openssl', + 'crypto.h') - f = open(openssl_crypto_h) + f = open(openssl_crypto_h) - regex = '^#\s*define OPENSSL_INFO_QUIC' + regex = '^#\s*define OPENSSL_INFO_QUIC' - for line in f: - if (re.match(regex, line)): - return True + for line in f: + if (re.match(regex, line)): + return True return False diff --git a/tools/license-builder.sh b/tools/license-builder.sh index d1d173943c1..05a15471c7e 100755 --- a/tools/license-builder.sh +++ b/tools/license-builder.sh @@ -113,5 +113,7 @@ addlicense "rimraf" "lib/internal/fs/rimraf.js" \ "$(curl -sL https://raw.githubusercontent.com/isaacs/rimraf/0e365ac4e4d64a25aa2a3cc026348f13410210e1/LICENSE)" addlicense "uvwasi" "deps/uvwasi" "$(cat "${rootdir}"/deps/uvwasi/LICENSE)" +addlicense "ngtcp2" "deps/ngtcp2/ngtcp2/" "$(cat "${rootdir}"/deps/ngtcp2/LICENSE_ngtcp2)" +addlicense "nghttp3" "deps/ngtcp2/nghttp3/" "$(cat "${rootdir}"/deps/ngtcp2/LICENSE_nghttp3)" mv "$tmplicense" "$licensefile" |