build: enable building with shared uvwasi lib
Fixes: https://github.com/nodejs/node/issues/35339 Co-authored-by: Pooja D P <Pooja.D.P@ibm.com> Co-authored-by: Teutates <103068388+Teutates@users.noreply.github.com> Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com> PR-URL: https://github.com/nodejs/node/pull/43987 Reviewed-By: Michael Dawson <midawson@redhat.com> Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
parent
ca2f874fe3
commit
49e2c690ae
23
configure.py
23
configure.py
@ -382,6 +382,28 @@ shared_optgroup.add_argument('--shared-openssl-libpath',
|
|||||||
dest='shared_openssl_libpath',
|
dest='shared_openssl_libpath',
|
||||||
help='a directory to search for the shared OpenSSL DLLs')
|
help='a directory to search for the shared OpenSSL DLLs')
|
||||||
|
|
||||||
|
shared_optgroup.add_argument('--shared-uvwasi',
|
||||||
|
action='store_true',
|
||||||
|
dest='shared_uvwasi',
|
||||||
|
default=None,
|
||||||
|
help='link to a shared uvwasi DLL instead of static linking')
|
||||||
|
|
||||||
|
shared_optgroup.add_argument('--shared-uvwasi-includes',
|
||||||
|
action='store',
|
||||||
|
dest='shared_uvwasi_includes',
|
||||||
|
help='directory containing uvwasi header files')
|
||||||
|
|
||||||
|
shared_optgroup.add_argument('--shared-uvwasi-libname',
|
||||||
|
action='store',
|
||||||
|
dest='shared_uvwasi_libname',
|
||||||
|
default='uvwasi',
|
||||||
|
help='alternative lib name to link to [default: %default]')
|
||||||
|
|
||||||
|
shared_optgroup.add_argument('--shared-uvwasi-libpath',
|
||||||
|
action='store',
|
||||||
|
dest='shared_uvwasi_libpath',
|
||||||
|
help='a directory to search for the shared uvwasi DLL')
|
||||||
|
|
||||||
shared_optgroup.add_argument('--shared-zlib',
|
shared_optgroup.add_argument('--shared-zlib',
|
||||||
action='store_true',
|
action='store_true',
|
||||||
dest='shared_zlib',
|
dest='shared_zlib',
|
||||||
@ -2122,6 +2144,7 @@ configure_library('cares', output, pkgname='libcares')
|
|||||||
configure_library('nghttp2', output, pkgname='libnghttp2')
|
configure_library('nghttp2', output, pkgname='libnghttp2')
|
||||||
configure_library('nghttp3', output, pkgname='libnghttp3')
|
configure_library('nghttp3', output, pkgname='libnghttp3')
|
||||||
configure_library('ngtcp2', output, pkgname='libngtcp2')
|
configure_library('ngtcp2', output, pkgname='libngtcp2')
|
||||||
|
configure_library('uvwasi', output, pkgname='libuvwasi')
|
||||||
configure_v8(output)
|
configure_v8(output)
|
||||||
configure_openssl(output)
|
configure_openssl(output)
|
||||||
configure_intl(output)
|
configure_intl(output)
|
||||||
|
13
node.gyp
13
node.gyp
@ -19,6 +19,7 @@
|
|||||||
'node_shared_http_parser%': 'false',
|
'node_shared_http_parser%': 'false',
|
||||||
'node_shared_cares%': 'false',
|
'node_shared_cares%': 'false',
|
||||||
'node_shared_libuv%': 'false',
|
'node_shared_libuv%': 'false',
|
||||||
|
'node_shared_uvwasi%': 'false',
|
||||||
'node_shared_nghttp2%': 'false',
|
'node_shared_nghttp2%': 'false',
|
||||||
'node_use_openssl%': 'true',
|
'node_use_openssl%': 'true',
|
||||||
'node_shared_openssl%': 'false',
|
'node_shared_openssl%': 'false',
|
||||||
@ -550,7 +551,6 @@
|
|||||||
|
|
||||||
'dependencies': [
|
'dependencies': [
|
||||||
'deps/histogram/histogram.gyp:histogram',
|
'deps/histogram/histogram.gyp:histogram',
|
||||||
'deps/uvwasi/uvwasi.gyp:uvwasi',
|
|
||||||
],
|
],
|
||||||
|
|
||||||
'msvs_settings': {
|
'msvs_settings': {
|
||||||
@ -845,7 +845,6 @@
|
|||||||
'dependencies': [
|
'dependencies': [
|
||||||
'deps/googletest/googletest.gyp:gtest_prod',
|
'deps/googletest/googletest.gyp:gtest_prod',
|
||||||
'deps/histogram/histogram.gyp:histogram',
|
'deps/histogram/histogram.gyp:histogram',
|
||||||
'deps/uvwasi/uvwasi.gyp:uvwasi',
|
|
||||||
'deps/simdjson/simdjson.gyp:simdjson',
|
'deps/simdjson/simdjson.gyp:simdjson',
|
||||||
'deps/simdutf/simdutf.gyp:simdutf',
|
'deps/simdutf/simdutf.gyp:simdutf',
|
||||||
'deps/ada/ada.gyp:ada',
|
'deps/ada/ada.gyp:ada',
|
||||||
@ -1030,8 +1029,8 @@
|
|||||||
'dependencies': [
|
'dependencies': [
|
||||||
'<(node_lib_target_name)',
|
'<(node_lib_target_name)',
|
||||||
'deps/histogram/histogram.gyp:histogram',
|
'deps/histogram/histogram.gyp:histogram',
|
||||||
'deps/uvwasi/uvwasi.gyp:uvwasi',
|
|
||||||
],
|
],
|
||||||
|
|
||||||
'includes': [
|
'includes': [
|
||||||
'node.gypi'
|
'node.gypi'
|
||||||
],
|
],
|
||||||
@ -1041,9 +1040,9 @@
|
|||||||
'deps/v8/include',
|
'deps/v8/include',
|
||||||
'deps/cares/include',
|
'deps/cares/include',
|
||||||
'deps/uv/include',
|
'deps/uv/include',
|
||||||
'deps/uvwasi/include',
|
|
||||||
'test/cctest',
|
'test/cctest',
|
||||||
],
|
],
|
||||||
|
|
||||||
'defines': [
|
'defines': [
|
||||||
'NODE_ARCH="<(target_arch)"',
|
'NODE_ARCH="<(target_arch)"',
|
||||||
'NODE_PLATFORM="<(OS)"',
|
'NODE_PLATFORM="<(OS)"',
|
||||||
@ -1076,7 +1075,6 @@
|
|||||||
'deps/googletest/googletest.gyp:gtest',
|
'deps/googletest/googletest.gyp:gtest',
|
||||||
'deps/googletest/googletest.gyp:gtest_main',
|
'deps/googletest/googletest.gyp:gtest_main',
|
||||||
'deps/histogram/histogram.gyp:histogram',
|
'deps/histogram/histogram.gyp:histogram',
|
||||||
'deps/uvwasi/uvwasi.gyp:uvwasi',
|
|
||||||
'deps/simdjson/simdjson.gyp:simdjson',
|
'deps/simdjson/simdjson.gyp:simdjson',
|
||||||
'deps/simdutf/simdutf.gyp:simdutf',
|
'deps/simdutf/simdutf.gyp:simdutf',
|
||||||
'deps/ada/ada.gyp:ada',
|
'deps/ada/ada.gyp:ada',
|
||||||
@ -1092,7 +1090,6 @@
|
|||||||
'deps/v8/include',
|
'deps/v8/include',
|
||||||
'deps/cares/include',
|
'deps/cares/include',
|
||||||
'deps/uv/include',
|
'deps/uv/include',
|
||||||
'deps/uvwasi/include',
|
|
||||||
'test/cctest',
|
'test/cctest',
|
||||||
],
|
],
|
||||||
|
|
||||||
@ -1154,7 +1151,6 @@
|
|||||||
'dependencies': [
|
'dependencies': [
|
||||||
'<(node_lib_target_name)',
|
'<(node_lib_target_name)',
|
||||||
'deps/histogram/histogram.gyp:histogram',
|
'deps/histogram/histogram.gyp:histogram',
|
||||||
'deps/uvwasi/uvwasi.gyp:uvwasi',
|
|
||||||
'deps/ada/ada.gyp:ada',
|
'deps/ada/ada.gyp:ada',
|
||||||
],
|
],
|
||||||
|
|
||||||
@ -1168,7 +1164,6 @@
|
|||||||
'deps/v8/include',
|
'deps/v8/include',
|
||||||
'deps/cares/include',
|
'deps/cares/include',
|
||||||
'deps/uv/include',
|
'deps/uv/include',
|
||||||
'deps/uvwasi/include',
|
|
||||||
'test/embedding',
|
'test/embedding',
|
||||||
],
|
],
|
||||||
|
|
||||||
@ -1268,7 +1263,6 @@
|
|||||||
'dependencies': [
|
'dependencies': [
|
||||||
'<(node_lib_target_name)',
|
'<(node_lib_target_name)',
|
||||||
'deps/histogram/histogram.gyp:histogram',
|
'deps/histogram/histogram.gyp:histogram',
|
||||||
'deps/uvwasi/uvwasi.gyp:uvwasi',
|
|
||||||
'deps/ada/ada.gyp:ada',
|
'deps/ada/ada.gyp:ada',
|
||||||
'deps/simdjson/simdjson.gyp:simdjson',
|
'deps/simdjson/simdjson.gyp:simdjson',
|
||||||
'deps/simdutf/simdutf.gyp:simdutf',
|
'deps/simdutf/simdutf.gyp:simdutf',
|
||||||
@ -1284,7 +1278,6 @@
|
|||||||
'deps/v8/include',
|
'deps/v8/include',
|
||||||
'deps/cares/include',
|
'deps/cares/include',
|
||||||
'deps/uv/include',
|
'deps/uv/include',
|
||||||
'deps/uvwasi/include',
|
|
||||||
],
|
],
|
||||||
|
|
||||||
'defines': [ 'NODE_WANT_INTERNALS=1' ],
|
'defines': [ 'NODE_WANT_INTERNALS=1' ],
|
||||||
|
@ -204,6 +204,10 @@
|
|||||||
],
|
],
|
||||||
}],
|
}],
|
||||||
|
|
||||||
|
[ 'node_shared_uvwasi=="false"', {
|
||||||
|
'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ],
|
||||||
|
}],
|
||||||
|
|
||||||
[ 'node_shared_nghttp2=="false"', {
|
[ 'node_shared_nghttp2=="false"', {
|
||||||
'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
|
'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
|
||||||
}],
|
}],
|
||||||
|
Loading…
x
Reference in New Issue
Block a user