From efb406ccd55dc091ea28a6bcb8f4e792bbd3e380 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Sun, 27 Oct 2019 14:28:04 +0100 Subject: [PATCH] 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 PR-URL: https://github.com/nodejs/node/pull/30145 Fixes: https://github.com/nodejs/node/issues/30113 Reviewed-By: Anna Henningsen Reviewed-By: Richard Lau Reviewed-By: Luigi Pinca Reviewed-By: Colin Ihrig Reviewed-By: Trivikram Kamat Reviewed-By: Chengzhong Wu --- configure.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/configure.py b/configure.py index 8790b3c13fc..959c1db6518 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)