FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

build: enable building with shared uvwasi lib · nodejs/node@f96466a · GitHub

/ node Public

Commit f96466a

Browse files
authored and
targos
committed
build: enable building with shared uvwasi lib
Fixes: #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: #43987 Reviewed-By: Michael Dawson <midawson@redhat.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 80fa675 commit f96466a

3 files changed

Lines changed: 30 additions & 10 deletions

File tree

‎configure.py‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,28 @@
382382
dest='shared_openssl_libpath',
383383
help='a directory to search for the shared OpenSSL DLLs')
384384

385+
shared_optgroup.add_argument('--shared-uvwasi',
386+
action='store_true',
387+
dest='shared_uvwasi',
388+
default=None,
389+
help='link to a shared uvwasi DLL instead of static linking')
390+
391+
shared_optgroup.add_argument('--shared-uvwasi-includes',
392+
action='store',
393+
dest='shared_uvwasi_includes',
394+
help='directory containing uvwasi header files')
395+
396+
shared_optgroup.add_argument('--shared-uvwasi-libname',
397+
action='store',
398+
dest='shared_uvwasi_libname',
399+
default='uvwasi',
400+
help='alternative lib name to link to [default: %default]')
401+
402+
shared_optgroup.add_argument('--shared-uvwasi-libpath',
403+
action='store',
404+
dest='shared_uvwasi_libpath',
405+
help='a directory to search for the shared uvwasi DLL')
406+
385407
shared_optgroup.add_argument('--shared-zlib',
386408
action='store_true',
387409
dest='shared_zlib',
@@ -2122,6 +2144,7 @@ def make_bin_override():
21222144
configure_library('nghttp2', output, pkgname='libnghttp2')
21232145
configure_library('nghttp3', output, pkgname='libnghttp3')
21242146
configure_library('ngtcp2', output, pkgname='libngtcp2')
2147+
configure_library('uvwasi', output, pkgname='libuvwasi')
21252148
configure_v8(output)
21262149
configure_openssl(output)
21272150
configure_intl(output)

‎node.gyp‎

Lines changed: 3 additions & 10 deletions
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_uvwasi%': 'false',
2223
'node_shared_nghttp2%': 'false',
2324
'node_use_openssl%': 'true',
2425
'node_shared_openssl%': 'false',
@@ -550,7 +551,6 @@
550551

551552
'dependencies': [
552553
'deps/histogram/histogram.gyp:histogram',
553-
'deps/uvwasi/uvwasi.gyp:uvwasi',
554554
],
555555

556556
'msvs_settings': {
@@ -845,7 +845,6 @@
845845
'dependencies': [
846846
'deps/googletest/googletest.gyp:gtest_prod',
847847
'deps/histogram/histogram.gyp:histogram',
848-
'deps/uvwasi/uvwasi.gyp:uvwasi',
849848
'deps/simdjson/simdjson.gyp:simdjson',
850849
'deps/simdutf/simdutf.gyp:simdutf',
851850
'deps/ada/ada.gyp:ada',
@@ -1031,8 +1030,8 @@
10311030
'dependencies': [
10321031
'<(node_lib_target_name)',
10331032
'deps/histogram/histogram.gyp:histogram',
1034-
'deps/uvwasi/uvwasi.gyp:uvwasi',
10351033
],
1034+
10361035
'includes': [
10371036
'node.gypi'
10381037
],
@@ -1042,9 +1041,9 @@
10421041
'deps/v8/include',
10431042
'deps/cares/include',
10441043
'deps/uv/include',
1045-
'deps/uvwasi/include',
10461044
'test/cctest',
10471045
],
1046+
10481047
'defines': [
10491048
'NODE_ARCH="<(target_arch)"',
10501049
'NODE_PLATFORM="<(OS)"',
@@ -1077,7 +1076,6 @@
10771076
'deps/googletest/googletest.gyp:gtest',
10781077
'deps/googletest/googletest.gyp:gtest_main',
10791078
'deps/histogram/histogram.gyp:histogram',
1080-
'deps/uvwasi/uvwasi.gyp:uvwasi',
10811079
'deps/simdjson/simdjson.gyp:simdjson',
10821080
'deps/simdutf/simdutf.gyp:simdutf',
10831081
'deps/ada/ada.gyp:ada',
@@ -1093,7 +1091,6 @@
10931091
'deps/v8/include',
10941092
'deps/cares/include',
10951093
'deps/uv/include',
1096-
'deps/uvwasi/include',
10971094
'test/cctest',
10981095
],
10991096

@@ -1155,7 +1152,6 @@
11551152
'dependencies': [
11561153
'<(node_lib_target_name)',
11571154
'deps/histogram/histogram.gyp:histogram',
1158-
'deps/uvwasi/uvwasi.gyp:uvwasi',
11591155
'deps/ada/ada.gyp:ada',
11601156
],
11611157

@@ -1169,7 +1165,6 @@
11691165
'deps/v8/include',
11701166
'deps/cares/include',
11711167
'deps/uv/include',
1172-
'deps/uvwasi/include',
11731168
'test/embedding',
11741169
],
11751170

@@ -1269,7 +1264,6 @@
12691264
'dependencies': [
12701265
'<(node_lib_target_name)',
12711266
'deps/histogram/histogram.gyp:histogram',
1272-
'deps/uvwasi/uvwasi.gyp:uvwasi',
12731267
'deps/ada/ada.gyp:ada',
12741268
'deps/simdjson/simdjson.gyp:simdjson',
12751269
'deps/simdutf/simdutf.gyp:simdutf',
@@ -1285,7 +1279,6 @@
12851279
'deps/v8/include',
12861280
'deps/cares/include',
12871281
'deps/uv/include',
1288-
'deps/uvwasi/include',
12891282
],
12901283

12911284
'defines': [ 'NODE_WANT_INTERNALS=1' ],

‎node.gypi‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,10 @@
204204
],
205205
}],
206206

207+
[ 'node_shared_uvwasi=="false"', {
208+
'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ],
209+
}],
210+
207211
[ 'node_shared_nghttp2=="false"', {
208212
'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
209213
}],

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL