Commit 6413524
build: allow use of system-installed brotli
brotli is available as a shared library since 2016, so it makes sense
to allow its use as a system-installed version.
Some of the infrastructure was in place already (node.gyp and
node.gypi), but some bits in the configure script here were missing.
Add them, keeping the default as before, to use the bundled version.
Refs: google/brotli#421
Signed-off-by: André Draszik <git@andred.net>
PR-URL: #32046
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>1 parent f07d423 commit 6413524
1 file changed
Lines changed: 22 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -301,6 +301,27 @@ | |||
| 301 | 301 | dest='shared_zlib_libpath', | |
| 302 | 302 | help='a directory to search for the shared zlib DLL') | |
| 303 | 303 | ||
| 304 | + shared_optgroup.add_option('--shared-brotli', | ||
| 305 | + action='store_true', | ||
| 306 | + dest='shared_brotli', | ||
| 307 | + help='link to a shared brotli DLL instead of static linking') | ||
| 308 | + | ||
| 309 | + shared_optgroup.add_option('--shared-brotli-includes', | ||
| 310 | + action='store', | ||
| 311 | + dest='shared_brotli_includes', | ||
| 312 | + help='directory containing brotli header files') | ||
| 313 | + | ||
| 314 | + shared_optgroup.add_option('--shared-brotli-libname', | ||
| 315 | + action='store', | ||
| 316 | + dest='shared_brotli_libname', | ||
| 317 | + default='brotlidec,brotlienc', | ||
| 318 | + help='alternative lib name to link to [default: %default]') | ||
| 319 | + | ||
| 320 | + shared_optgroup.add_option('--shared-brotli-libpath', | ||
| 321 | + action='store', | ||
| 322 | + dest='shared_brotli_libpath', | ||
| 323 | + help='a directory to search for the shared brotli DLL') | ||
| 324 | + | ||
| 304 | 325 | shared_optgroup.add_option('--shared-cares', | |
| 305 | 326 | action='store_true', | |
| 306 | 327 | dest='shared_cares', | |
@@ -1692,6 +1713,7 @@ def make_bin_override(): | |||
| 1692 | 1713 | configure_library('zlib', output) | |
| 1693 | 1714 | configure_library('http_parser', output) | |
| 1694 | 1715 | configure_library('libuv', output) | |
| 1716 | + configure_library('brotli', output, pkgname=['libbrotlidec', 'libbrotlienc']) | ||
| 1695 | 1717 | configure_library('cares', output, pkgname='libcares') | |
| 1696 | 1718 | configure_library('nghttp2', output, pkgname='libnghttp2') | |
| 1697 | 1719 | configure_v8(output) | |
0 commit comments