Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: configure with shared sqlite3 #53519

Merged
merged 1 commit into from
Jun 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,29 @@
dest='shared_cares_libpath',
help='a directory to search for the shared cares DLL')

shared_optgroup.add_argument('--shared-sqlite',
action='store_true',
dest='shared_sqlite',
default=None,
help='link to a shared sqlite DLL instead of static linking')

shared_optgroup.add_argument('--shared-sqlite-includes',
action='store',
dest='shared_sqlite_includes',
help='directory containing sqlite header files')

shared_optgroup.add_argument('--shared-sqlite-libname',
action='store',
dest='shared_sqlite_libname',
default='sqlite3',
help='alternative lib name to link to [default: %(default)s]')

shared_optgroup.add_argument('--shared-sqlite-libpath',
action='store',
dest='shared_sqlite_libpath',
help='a directory to search for the shared sqlite DLL')


for builtin in shareable_builtins:
builtin_id = 'shared_builtin_' + builtin + '_path'
shared_builtin_optgroup.add_argument('--shared-builtin-' + builtin + '-path',
Expand Down Expand Up @@ -2155,6 +2178,7 @@ def make_bin_override():
configure_library('nghttp2', output, pkgname='libnghttp2')
configure_library('nghttp3', output, pkgname='libnghttp3')
configure_library('ngtcp2', output, pkgname='libngtcp2')
configure_library('sqlite', output, pkgname='sqlite3')
configure_library('uvwasi', output, pkgname='libuvwasi')
configure_v8(output)
configure_openssl(output)
Expand Down
2 changes: 1 addition & 1 deletion node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
'node_shared_http_parser%': 'false',
'node_shared_cares%': 'false',
'node_shared_libuv%': 'false',
'node_shared_sqlite%': 'false',
'node_shared_uvwasi%': 'false',
'node_shared_nghttp2%': 'false',
'node_use_openssl%': 'true',
Expand Down Expand Up @@ -546,7 +547,6 @@

'dependencies': [
'deps/histogram/histogram.gyp:histogram',
'deps/sqlite/sqlite.gyp:sqlite',
],

'msvs_settings': {
Expand Down
4 changes: 4 additions & 0 deletions node.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,10 @@
'dependencies': [ 'deps/brotli/brotli.gyp:brotli' ],
}],

[ 'node_shared_sqlite=="false"', {
'dependencies': [ 'deps/sqlite/sqlite.gyp:sqlite' ],
}],

[ 'OS=="mac"', {
# linking Corefoundation is needed since certain OSX debugging tools
# like Instruments require it for some features
Expand Down
1 change: 1 addition & 0 deletions tools/generate_config_gypi.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ def translate_config(out_dir, config, v8_config):
'node_shared_nghttp3': 'false',
'node_shared_ngtcp2': 'false',
'node_shared_openssl': 'false',
'node_shared_sqlite': 'false',
'node_shared_zlib': 'false',
}
}
Expand Down
Loading