Skip to content
Open
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: 16 additions & 8 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -104,18 +104,26 @@ The externally maintained libraries used by Node.js are:
SOFTWARE.
"""

- cjs-module-lexer, located at deps/cjs-module-lexer, is licensed as follows:
- commonjs-lexer, located at deps/commonjs-lexer, is licensed as follows:
"""
MIT License
-----------

Copyright (C) 2018-2020 Guy Bedford
Copyright 2026 Yagiz Nizipli

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
"""

- ittapi, located at deps/v8/third_party/ittapi, is licensed as follows:
Expand Down
28 changes: 24 additions & 4 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@
maglev_enabled_architectures = ('x64', 'arm', 'arm64', 's390x')

# builtins may be removed later if they have been disabled by options
shareable_builtins = {'cjs_module_lexer/lexer': 'deps/cjs-module-lexer/lexer.js',
'cjs_module_lexer/dist/lexer': 'deps/cjs-module-lexer/dist/lexer.js',
'undici/undici': 'deps/undici/undici.js',
shareable_builtins = {'undici/undici': 'deps/undici/undici.js',
'amaro/dist/index': 'deps/amaro/dist/index.js'
}

Expand Down Expand Up @@ -556,7 +554,6 @@
dest='shared_simdutf_libpath',
help='a directory to search for the shared simdutf DLL')


shared_optgroup.add_argument('--shared-ada',
action='store_true',
dest='shared_ada',
Expand All @@ -579,6 +576,28 @@
dest='shared_ada_libpath',
help='a directory to search for the shared ada DLL')

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

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

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

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

shared_optgroup.add_argument('--shared-brotli',
action='store_true',
dest='shared_brotli',
Expand Down Expand Up @@ -2482,6 +2501,7 @@ def make_bin_override():
configure_library('cares', output, pkgname='libcares')
configure_library('gtest', output)
configure_library('hdr_histogram', output)
configure_library('merve', output)
configure_library('nbytes', output)
configure_library('nghttp2', output, pkgname='libnghttp2')
configure_library('nghttp3', output, pkgname='libnghttp3')
Expand Down
10 changes: 0 additions & 10 deletions deps/cjs-module-lexer/LICENSE

This file was deleted.

Loading