Skip to content

Commit

Permalink
build: configure with shared sqlite3
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
legendecas authored Jun 22, 2024
1 parent 69abdcd commit 78ea6ce
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 1 deletion.
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 @@ -543,7 +544,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

0 comments on commit 78ea6ce

Please sign in to comment.