Commit b255688
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: #30145
Fixes: #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>1 parent 1499a72 commit b255688
1 file changed
Lines changed: 9 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -298,23 +298,23 @@ | |||
| 298 | 298 | ||
| 299 | 299 | shared_optgroup.add_option('--shared-cares', | |
| 300 | 300 | action='store_true', | |
| 301 | - dest='shared_libcares', | ||
| 301 | + dest='shared_cares', | ||
| 302 | 302 | help='link to a shared cares DLL instead of static linking') | |
| 303 | 303 | ||
| 304 | 304 | shared_optgroup.add_option('--shared-cares-includes', | |
| 305 | 305 | action='store', | |
| 306 | - dest='shared_libcares_includes', | ||
| 306 | + dest='shared_cares_includes', | ||
| 307 | 307 | help='directory containing cares header files') | |
| 308 | 308 | ||
| 309 | 309 | shared_optgroup.add_option('--shared-cares-libname', | |
| 310 | 310 | action='store', | |
| 311 | - dest='shared_libcares_libname', | ||
| 311 | + dest='shared_cares_libname', | ||
| 312 | 312 | default='cares', | |
| 313 | 313 | help='alternative lib name to link to [default: %default]') | |
| 314 | 314 | ||
| 315 | 315 | shared_optgroup.add_option('--shared-cares-libpath', | |
| 316 | 316 | action='store', | |
| 317 | - dest='shared_libcares_libpath', | ||
| 317 | + dest='shared_cares_libpath', | ||
| 318 | 318 | help='a directory to search for the shared cares DLL') | |
| 319 | 319 | ||
| 320 | 320 | parser.add_option_group(shared_optgroup) | |
@@ -1138,12 +1138,13 @@ def configure_napi(output): | |||
| 1138 | 1138 | version = getnapibuildversion.get_napi_version() | |
| 1139 | 1139 | output['variables']['napi_build_version'] = version | |
| 1140 | 1140 | ||
| 1141 | - def configure_library(lib, output): | ||
| 1141 | + def configure_library(lib, output, pkgname=None): | ||
| 1142 | 1142 | shared_lib = 'shared_' + lib | |
| 1143 | 1143 | output['variables']['node_' + shared_lib] = b(getattr(options, shared_lib)) | |
| 1144 | 1144 | ||
| 1145 | 1145 | if getattr(options, shared_lib): | |
| 1146 | - (pkg_libs, pkg_cflags, pkg_libpath, pkg_modversion) = pkg_config(lib) | ||
| 1146 | + (pkg_libs, pkg_cflags, pkg_libpath, pkg_modversion) = ( | ||
| 1147 | + pkg_config(pkgname or lib)) | ||
| 1147 | 1148 | ||
| 1148 | 1149 | if options.__dict__[shared_lib + '_includes']: | |
| 1149 | 1150 | output['include_dirs'] += [options.__dict__[shared_lib + '_includes']] | |
@@ -1654,11 +1655,8 @@ def make_bin_override(): | |||
| 1654 | 1655 | configure_library('zlib', output) | |
| 1655 | 1656 | configure_library('http_parser', output) | |
| 1656 | 1657 | configure_library('libuv', output) | |
| 1657 | - configure_library('libcares', output) | ||
| 1658 | - configure_library('nghttp2', output) | ||
| 1659 | - # stay backwards compatible with shared cares builds | ||
| 1660 | - output['variables']['node_shared_cares'] = \ | ||
| 1661 | - output['variables'].pop('node_shared_libcares') | ||
| 1658 | + configure_library('cares', output, pkgname='libcares') | ||
| 1659 | + configure_library('nghttp2', output, pkgname='libnghttp2') | ||
| 1662 | 1660 | configure_v8(output) | |
| 1663 | 1661 | configure_openssl(output) | |
| 1664 | 1662 | configure_intl(output) | |
0 commit comments