Commit 2b4a09e
authored
build: fix OpenSSL version detection
Fix OpenSSL version detection in `configure.py` when `pkg-config` is
used to configure building with a shared OpenSSL library.
PR-URL: #59353
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>1 parent 31aacfa commit 2b4a09e
1 file changed
Lines changed: 6 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1205,7 +1205,7 @@ def get_gas_version(cc): | |||
| 1205 | 1205 | warn(f'Could not recognize `gas`: {gas_ret}') | |
| 1206 | 1206 | return '0.0' | |
| 1207 | 1207 | ||
| 1208 | - def get_openssl_version(): | ||
| 1208 | + def get_openssl_version(o): | ||
| 1209 | 1209 | """Parse OpenSSL version from opensslv.h header file. | |
| 1210 | 1210 | ||
| 1211 | 1211 | Returns the version as a number matching OPENSSL_VERSION_NUMBER format: | |
@@ -1219,6 +1219,9 @@ def get_openssl_version(): | |||
| 1219 | 1219 | args = ['-I', 'deps/openssl/openssl/include'] + args | |
| 1220 | 1220 | elif options.shared_openssl_includes: | |
| 1221 | 1221 | args = ['-I', options.shared_openssl_includes] + args | |
| 1222 | + else: | ||
| 1223 | + for dir in o['include_dirs']: | ||
| 1224 | + args = ['-I', dir] + args | ||
| 1222 | 1225 | ||
| 1223 | 1226 | proc = subprocess.Popen( | |
| 1224 | 1227 | shlex.split(CC) + args, | |
@@ -1887,10 +1890,10 @@ def without_ssl_error(option): | |||
| 1887 | 1890 | if options.quic: | |
| 1888 | 1891 | o['defines'] += ['NODE_OPENSSL_HAS_QUIC'] | |
| 1889 | 1892 | ||
| 1890 | - o['variables']['openssl_version'] = get_openssl_version() | ||
| 1891 | - | ||
| 1892 | 1893 | configure_library('openssl', o) | |
| 1893 | 1894 | ||
| 1895 | + o['variables']['openssl_version'] = get_openssl_version(o) | ||
| 1896 | + | ||
| 1894 | 1897 | def configure_sqlite(o): | |
| 1895 | 1898 | o['variables']['node_use_sqlite'] = b(not options.without_sqlite) | |
| 1896 | 1899 | if options.without_sqlite: | |
0 commit comments