Skip to content

Commit 529b3d5

Browse files
committed
build: add shared library support for ata dependency
1 parent 661e3f1 commit 529b3d5

2 files changed

Lines changed: 24 additions & 4 deletions

File tree

configure.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,28 @@
554554
help='a directory to search for the shared simdjson DLL')
555555

556556

557+
shared_optgroup.add_argument('--shared-ata',
558+
action='store_true',
559+
dest='shared_ata',
560+
default=None,
561+
help='link to a shared ata DLL instead of static linking')
562+
563+
shared_optgroup.add_argument('--shared-ata-includes',
564+
action='store',
565+
dest='shared_ata_includes',
566+
help='directory containing ata header files')
567+
568+
shared_optgroup.add_argument('--shared-ata-libname',
569+
action='store',
570+
dest='shared_ata_libname',
571+
default='ata',
572+
help='alternative lib name to link to [default: %(default)s]')
573+
574+
shared_optgroup.add_argument('--shared-ata-libpath',
575+
action='store',
576+
dest='shared_ata_libpath',
577+
help='a directory to search for the shared ata DLL')
578+
557579
shared_optgroup.add_argument('--shared-simdutf',
558580
action='store_true',
559581
dest='shared_simdutf',
@@ -2625,6 +2647,7 @@ def make_bin_override():
26252647
configure_library('libuv', output)
26262648
configure_library('ada', output)
26272649
configure_library('simdjson', output)
2650+
configure_library('ata', output)
26282651
configure_library('simdutf', output)
26292652
configure_library('brotli', output, pkgname=['libbrotlidec', 'libbrotlienc'])
26302653
configure_library('cares', output, pkgname='libcares')

node.gypi

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,7 @@
237237
'dependencies': [ 'deps/simdjson/simdjson.gyp:simdjson' ],
238238
}],
239239

240-
# ata is always built from source (no shared library option).
241-
# When simdjson is shared, ata still links against the shared lib
242-
# through its own simdjson dependency in ata.gyp.
243-
['1==1', {
240+
[ 'node_shared_ata=="false"', {
244241
'dependencies': [ 'deps/ata/ata.gyp:ata' ],
245242
}],
246243

0 commit comments

Comments
 (0)