diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2019-10-27 14:28:04 +0100 |
---|---|---|
committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2019-10-31 09:36:13 +0100 |
commit | efb406ccd55dc091ea28a6bcb8f4e792bbd3e380 (patch) | |
tree | 6b2123076d40cb749b612b0339de3f66a84752f1 /configure.py | |
parent | 99247e7662c6e4169c874a230760300eaa382207 (diff) | |
download | android-node-v8-efb406ccd55dc091ea28a6bcb8f4e792bbd3e380.tar.gz android-node-v8-efb406ccd55dc091ea28a6bcb8f4e792bbd3e380.tar.bz2 android-node-v8-efb406ccd55dc091ea28a6bcb8f4e792bbd3e380.zip |
build: fix pkg-config search for libnghttp2
The configure script was searching for 'nghttp2' whereas the actual name
of the package is 'libnghttp2'.
This change also removes the hack for libcares in one fell swoop.
Co-Authored-By: legendecas <legendecas@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/30145
Fixes: https://github.com/nodejs/node/issues/30113
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
Diffstat (limited to 'configure.py')
-rwxr-xr-x | configure.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/configure.py b/configure.py index 8790b3c13f..959c1db651 100755 --- a/configure.py +++ b/configure.py @@ -298,23 +298,23 @@ shared_optgroup.add_option('--shared-zlib-libpath', shared_optgroup.add_option('--shared-cares', action='store_true', - dest='shared_libcares', + dest='shared_cares', help='link to a shared cares DLL instead of static linking') shared_optgroup.add_option('--shared-cares-includes', action='store', - dest='shared_libcares_includes', + dest='shared_cares_includes', help='directory containing cares header files') shared_optgroup.add_option('--shared-cares-libname', action='store', - dest='shared_libcares_libname', + dest='shared_cares_libname', default='cares', help='alternative lib name to link to [default: %default]') shared_optgroup.add_option('--shared-cares-libpath', action='store', - dest='shared_libcares_libpath', + dest='shared_cares_libpath', help='a directory to search for the shared cares DLL') parser.add_option_group(shared_optgroup) @@ -1138,12 +1138,13 @@ def configure_napi(output): version = getnapibuildversion.get_napi_version() output['variables']['napi_build_version'] = version -def configure_library(lib, output): +def configure_library(lib, output, pkgname=None): shared_lib = 'shared_' + lib output['variables']['node_' + shared_lib] = b(getattr(options, shared_lib)) if getattr(options, shared_lib): - (pkg_libs, pkg_cflags, pkg_libpath, pkg_modversion) = pkg_config(lib) + (pkg_libs, pkg_cflags, pkg_libpath, pkg_modversion) = ( + pkg_config(pkgname or lib)) if options.__dict__[shared_lib + '_includes']: output['include_dirs'] += [options.__dict__[shared_lib + '_includes']] @@ -1654,11 +1655,8 @@ configure_napi(output) configure_library('zlib', output) configure_library('http_parser', output) configure_library('libuv', output) -configure_library('libcares', output) -configure_library('nghttp2', output) -# stay backwards compatible with shared cares builds -output['variables']['node_shared_cares'] = \ - output['variables'].pop('node_shared_libcares') +configure_library('cares', output, pkgname='libcares') +configure_library('nghttp2', output, pkgname='libnghttp2') configure_v8(output) configure_openssl(output) configure_intl(output) |