Skip to content

Shared brotli #32046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Shared brotli #32046

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
122ca47
build: allow passing multiple libs to pkg_config
andred Mar 2, 2020
c7265f7
build: allow use of system-installed brotli
andred Mar 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,27 @@
dest='shared_zlib_libpath',
help='a directory to search for the shared zlib DLL')

shared_optgroup.add_option('--shared-brotli',
action='store_true',
dest='shared_brotli',
help='link to a shared brotli DLL instead of static linking')

shared_optgroup.add_option('--shared-brotli-includes',
action='store',
dest='shared_brotli_includes',
help='directory containing brotli header files')

shared_optgroup.add_option('--shared-brotli-libname',
action='store',
dest='shared_brotli_libname',
default='brotlidec,brotlienc',
help='alternative lib name to link to [default: %default]')

shared_optgroup.add_option('--shared-brotli-libpath',
action='store',
dest='shared_brotli_libpath',
help='a directory to search for the shared brotli DLL')

shared_optgroup.add_option('--shared-cares',
action='store_true',
dest='shared_cares',
Expand Down Expand Up @@ -680,7 +701,11 @@ def pkg_config(pkg):
retval = ()
for flag in ['--libs-only-l', '--cflags-only-I',
'--libs-only-L', '--modversion']:
args += [flag, pkg]
args += [flag]
if isinstance(pkg, list):
args += pkg
else:
args += [pkg]
try:
proc = subprocess.Popen(shlex.split(pkg_config) + args,
stdout=subprocess.PIPE)
Expand Down Expand Up @@ -1688,6 +1713,7 @@ def make_bin_override():
configure_library('zlib', output)
configure_library('http_parser', output)
configure_library('libuv', output)
configure_library('brotli', output, pkgname=['libbrotlidec', 'libbrotlienc'])
configure_library('cares', output, pkgname='libcares')
configure_library('nghttp2', output, pkgname='libnghttp2')
configure_v8(output)
Expand Down