Commit 09bd797
build: Allow linking against an external copy of nghttp2.
The version of nghttp2 in deps/ does not build on CloudABI, even though
the official version does. Though this is an issue on its own that needs
to be resolved, it is currently a bit hard to work around this. There is
no switch to link against an external version of nghttp2, even though we
do provide this option for other libraries.
This change adds configure flags, similar to the ones we have for
OpenSSL, zlib, http_parser, libuv, etc. and makes the dependency on
deps/nghttp2 optional.
PR-URL: #16788
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>1 parent 4954eef commit 09bd797
3 files changed
Lines changed: 36 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -220,6 +220,27 @@ shared_optgroup.add_option('--shared-libuv-libpath', | |||
| 220 | 220 | dest='shared_libuv_libpath', | |
| 221 | 221 | help='a directory to search for the shared libuv DLL') | |
| 222 | 222 | ||
| 223 | + shared_optgroup.add_option('--shared-nghttp2', | ||
| 224 | + action='store_true', | ||
| 225 | + dest='shared_nghttp2', | ||
| 226 | + help='link to a shared nghttp2 DLL instead of static linking') | ||
| 227 | + | ||
| 228 | + shared_optgroup.add_option('--shared-nghttp2-includes', | ||
| 229 | + action='store', | ||
| 230 | + dest='shared_nghttp2_includes', | ||
| 231 | + help='directory containing nghttp2 header files') | ||
| 232 | + | ||
| 233 | + shared_optgroup.add_option('--shared-nghttp2-libname', | ||
| 234 | + action='store', | ||
| 235 | + dest='shared_nghttp2_libname', | ||
| 236 | + default='nghttp2', | ||
| 237 | + help='alternative lib name to link to [default: %default]') | ||
| 238 | + | ||
| 239 | + shared_optgroup.add_option('--shared-nghttp2-libpath', | ||
| 240 | + action='store', | ||
| 241 | + dest='shared_nghttp2_libpath', | ||
| 242 | + help='a directory to search for the shared nghttp2 DLLs') | ||
| 243 | + | ||
| 223 | 244 | shared_optgroup.add_option('--shared-openssl', | |
| 224 | 245 | action='store_true', | |
| 225 | 246 | dest='shared_openssl', | |
@@ -1415,6 +1436,7 @@ configure_library('zlib', output) | |||
| 1415 | 1436 | configure_library('http_parser', output) | |
| 1416 | 1437 | configure_library('libuv', output) | |
| 1417 | 1438 | configure_library('libcares', output) | |
| 1439 | + configure_library('nghttp2', output) | ||
| 1418 | 1440 | # stay backwards compatible with shared cares builds | |
| 1419 | 1441 | output['variables']['node_shared_cares'] = \ | |
| 1420 | 1442 | output['variables'].pop('node_shared_libcares') | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -16,6 +16,7 @@ | |||
| 16 | 16 | 'node_shared_http_parser%': 'false', | |
| 17 | 17 | 'node_shared_cares%': 'false', | |
| 18 | 18 | 'node_shared_libuv%': 'false', | |
| 19 | + 'node_shared_nghttp2%': 'false', | ||
| 19 | 20 | 'node_use_openssl%': 'true', | |
| 20 | 21 | 'node_shared_openssl%': 'false', | |
| 21 | 22 | 'node_v8_options%': '', | |
@@ -173,7 +174,6 @@ | |||
| 173 | 174 | ||
| 174 | 175 | 'dependencies': [ | |
| 175 | 176 | 'node_js2c#host', | |
| 176 | - 'deps/nghttp2/nghttp2.gyp:nghttp2' | ||
| 177 | 177 | ], | |
| 178 | 178 | ||
| 179 | 179 | 'includes': [ | |
@@ -183,8 +183,7 @@ | |||
| 183 | 183 | 'include_dirs': [ | |
| 184 | 184 | 'src', | |
| 185 | 185 | 'tools/msvs/genfiles', | |
| 186 | - '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h | ||
| 187 | - 'deps/nghttp2/lib/includes' | ||
| 186 | + '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h | ||
| 188 | 187 | ], | |
| 189 | 188 | ||
| 190 | 189 | 'sources': [ | |
@@ -923,6 +922,14 @@ | |||
| 923 | 922 | 'deps/uv/uv.gyp:libuv' | |
| 924 | 923 | ] | |
| 925 | 924 | }], | |
| 925 | + [ 'node_shared_nghttp2=="false"', { | ||
| 926 | + 'dependencies': [ | ||
| 927 | + 'deps/nghttp2/nghttp2.gyp:nghttp2' | ||
| 928 | + ], | ||
| 929 | + 'include_dirs': [ | ||
| 930 | + 'deps/nghttp2/lib/includes' | ||
| 931 | + ] | ||
| 932 | + }], | ||
| 926 | 933 | [ 'node_use_v8_platform=="true"', { | |
| 927 | 934 | 'dependencies': [ | |
| 928 | 935 | 'deps/v8/src/v8.gyp:v8_libplatform', | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -133,6 +133,10 @@ | |||
| 133 | 133 | 'dependencies': [ 'deps/uv/uv.gyp:libuv' ], | |
| 134 | 134 | }], | |
| 135 | 135 | ||
| 136 | + [ 'node_shared_nghttp2=="false"', { | ||
| 137 | + 'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ], | ||
| 138 | + }], | ||
| 139 | + | ||
| 136 | 140 | [ 'OS=="mac"', { | |
| 137 | 141 | # linking Corefoundation is needed since certain OSX debugging tools | |
| 138 | 142 | # like Instruments require it for some features | |
0 commit comments