Commit 1de4375
build: configure with shared sqlite3
PR-URL: #53519
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>1 parent ec38f3d commit 1de4375
4 files changed
Lines changed: 30 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -538,6 +538,29 @@ | |||
| 538 | 538 | dest='shared_cares_libpath', | |
| 539 | 539 | help='a directory to search for the shared cares DLL') | |
| 540 | 540 | ||
| 541 | + shared_optgroup.add_argument('--shared-sqlite', | ||
| 542 | + action='store_true', | ||
| 543 | + dest='shared_sqlite', | ||
| 544 | + default=None, | ||
| 545 | + help='link to a shared sqlite DLL instead of static linking') | ||
| 546 | + | ||
| 547 | + shared_optgroup.add_argument('--shared-sqlite-includes', | ||
| 548 | + action='store', | ||
| 549 | + dest='shared_sqlite_includes', | ||
| 550 | + help='directory containing sqlite header files') | ||
| 551 | + | ||
| 552 | + shared_optgroup.add_argument('--shared-sqlite-libname', | ||
| 553 | + action='store', | ||
| 554 | + dest='shared_sqlite_libname', | ||
| 555 | + default='sqlite3', | ||
| 556 | + help='alternative lib name to link to [default: %(default)s]') | ||
| 557 | + | ||
| 558 | + shared_optgroup.add_argument('--shared-sqlite-libpath', | ||
| 559 | + action='store', | ||
| 560 | + dest='shared_sqlite_libpath', | ||
| 561 | + help='a directory to search for the shared sqlite DLL') | ||
| 562 | + | ||
| 563 | + | ||
| 541 | 564 | for builtin in shareable_builtins: | |
| 542 | 565 | builtin_id = 'shared_builtin_' + builtin + '_path' | |
| 543 | 566 | shared_builtin_optgroup.add_argument('--shared-builtin-' + builtin + '-path', | |
@@ -2156,6 +2179,7 @@ def make_bin_override(): | |||
| 2156 | 2179 | configure_library('nghttp2', output, pkgname='libnghttp2') | |
| 2157 | 2180 | configure_library('nghttp3', output, pkgname='libnghttp3') | |
| 2158 | 2181 | configure_library('ngtcp2', output, pkgname='libngtcp2') | |
| 2182 | + configure_library('sqlite', output, pkgname='sqlite3') | ||
| 2159 | 2183 | configure_library('uvwasi', output, pkgname='libuvwasi') | |
| 2160 | 2184 | configure_v8(output) | |
| 2161 | 2185 | configure_openssl(output) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -19,6 +19,7 @@ | |||
| 19 | 19 | 'node_shared_http_parser%': 'false', | |
| 20 | 20 | 'node_shared_cares%': 'false', | |
| 21 | 21 | 'node_shared_libuv%': 'false', | |
| 22 | + 'node_shared_sqlite%': 'false', | ||
| 22 | 23 | 'node_shared_uvwasi%': 'false', | |
| 23 | 24 | 'node_shared_nghttp2%': 'false', | |
| 24 | 25 | 'node_use_openssl%': 'true', | |
@@ -552,7 +553,6 @@ | |||
| 552 | 553 | ||
| 553 | 554 | 'dependencies': [ | |
| 554 | 555 | 'deps/histogram/histogram.gyp:histogram', | |
| 555 | - 'deps/sqlite/sqlite.gyp:sqlite', | ||
| 556 | 556 | ], | |
| 557 | 557 | ||
| 558 | 558 | 'msvs_settings': { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -220,6 +220,10 @@ | |||
| 220 | 220 | 'dependencies': [ 'deps/brotli/brotli.gyp:brotli' ], | |
| 221 | 221 | }], | |
| 222 | 222 | ||
| 223 | + [ 'node_shared_sqlite=="false"', { | ||
| 224 | + 'dependencies': [ 'deps/sqlite/sqlite.gyp:sqlite' ], | ||
| 225 | + }], | ||
| 226 | + | ||
| 223 | 227 | [ 'OS=="mac"', { | |
| 224 | 228 | # linking Corefoundation is needed since certain OSX debugging tools | |
| 225 | 229 | # like Instruments require it for some features | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -106,6 +106,7 @@ def translate_config(out_dir, config, v8_config): | |||
| 106 | 106 | 'node_shared_nghttp3': 'false', | |
| 107 | 107 | 'node_shared_ngtcp2': 'false', | |
| 108 | 108 | 'node_shared_openssl': 'false', | |
| 109 | + 'node_shared_sqlite': 'false', | ||
| 109 | 110 | 'node_shared_zlib': 'false', | |
| 110 | 111 | } | |
| 111 | 112 | } | |
0 commit comments