Skip to content

Commit 1de4375

Browse files
legendecastargos
authored andcommitted
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

File tree

4 files changed

+30
-1
lines changed

4 files changed

+30
-1
lines changed

configure.py

+24
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,29 @@
538538
dest='shared_cares_libpath',
539539
help='a directory to search for the shared cares DLL')
540540

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+
541564
for builtin in shareable_builtins:
542565
builtin_id = 'shared_builtin_' + builtin + '_path'
543566
shared_builtin_optgroup.add_argument('--shared-builtin-' + builtin + '-path',
@@ -2156,6 +2179,7 @@ def make_bin_override():
21562179
configure_library('nghttp2', output, pkgname='libnghttp2')
21572180
configure_library('nghttp3', output, pkgname='libnghttp3')
21582181
configure_library('ngtcp2', output, pkgname='libngtcp2')
2182+
configure_library('sqlite', output, pkgname='sqlite3')
21592183
configure_library('uvwasi', output, pkgname='libuvwasi')
21602184
configure_v8(output)
21612185
configure_openssl(output)

node.gyp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
'node_shared_http_parser%': 'false',
2020
'node_shared_cares%': 'false',
2121
'node_shared_libuv%': 'false',
22+
'node_shared_sqlite%': 'false',
2223
'node_shared_uvwasi%': 'false',
2324
'node_shared_nghttp2%': 'false',
2425
'node_use_openssl%': 'true',
@@ -552,7 +553,6 @@
552553

553554
'dependencies': [
554555
'deps/histogram/histogram.gyp:histogram',
555-
'deps/sqlite/sqlite.gyp:sqlite',
556556
],
557557

558558
'msvs_settings': {

node.gypi

+4
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,10 @@
220220
'dependencies': [ 'deps/brotli/brotli.gyp:brotli' ],
221221
}],
222222

223+
[ 'node_shared_sqlite=="false"', {
224+
'dependencies': [ 'deps/sqlite/sqlite.gyp:sqlite' ],
225+
}],
226+
223227
[ 'OS=="mac"', {
224228
# linking Corefoundation is needed since certain OSX debugging tools
225229
# like Instruments require it for some features

tools/generate_config_gypi.py

+1
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ def translate_config(out_dir, config, v8_config):
106106
'node_shared_nghttp3': 'false',
107107
'node_shared_ngtcp2': 'false',
108108
'node_shared_openssl': 'false',
109+
'node_shared_sqlite': 'false',
109110
'node_shared_zlib': 'false',
110111
}
111112
}

0 commit comments

Comments
 (0)