GeezerVison is showing github.com — build: add `--shared-nbytes` configure flag · nodejs/node@8255cde
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: .github/workflows/test-shared.yml +2Lines changed: 2 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 23 | 23 | - deps/icu-small/** | 24 | 24 | - deps/icu-tmp/** | 25 | 25 | - deps/llhttp/** | | 26 | + - deps/nbytes/** | 26 | 27 | - deps/nghttp2/** | 27 | 28 | - deps/ngtcp2/** | 28 | 29 | - deps/openssl/*/** | | 71 | 72 | - deps/icu-small/** | 72 | 73 | - deps/icu-tmp/** | 73 | 74 | - deps/llhttp/** | | 75 | + - deps/nbytes/** | 74 | 76 | - deps/nghttp2/** | 75 | 77 | - deps/ngtcp2/** | 76 | 78 | - deps/openssl/*/** | |
Collapse file Copy file name to clipboardExpand all lines: Makefile +1Lines changed: 1 addition & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -1240,6 +1240,7 @@ ifeq ($(SKIP_SHARED_DEPS), 1) | 1240 | 1240 | $(RM) -r $(TARNAME)/deps/icu-small | 1241 | 1241 | $(RM) -r $(TARNAME)/deps/icu-tmp | 1242 | 1242 | $(RM) -r $(TARNAME)/deps/llhttp | | 1243 | + $(RM) -r $(TARNAME)/deps/nbytes | 1243 | 1244 | $(RM) -r $(TARNAME)/deps/nghttp2 | 1244 | 1245 | $(RM) -r $(TARNAME)/deps/ngtcp2 | 1245 | 1246 | find $(TARNAME)/deps/openssl -maxdepth 1 -type f ! -name 'nodejs-openssl.cnf' -exec $(RM) {} + | |
Collapse file Copy file name to clipboardExpand all lines: configure.py +23Lines changed: 23 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 357 | 357 | dest='shared_libuv_libpath', | 358 | 358 | help='a directory to search for the shared libuv DLL') | 359 | 359 |
| | 360 | +shared_optgroup.add_argument('--shared-nbytes', | | 361 | + action='store_true', | | 362 | + dest='shared_nbytes', | | 363 | + default=None, | | 364 | + help='link to a shared nbytes DLL instead of static linking') | | 365 | + | | 366 | +shared_optgroup.add_argument('--shared-nbytes-includes', | | 367 | + action='store', | | 368 | + dest='shared_nbytes_includes', | | 369 | + help='directory containing nbytes header files') | | 370 | + | | 371 | +shared_optgroup.add_argument('--shared-nbytes-libname', | | 372 | + action='store', | | 373 | + dest='shared_nbytes_libname', | | 374 | + default='nbytes', | | 375 | + help='alternative lib name to link to [default: %(default)s]') | | 376 | + | | 377 | +shared_optgroup.add_argument('--shared-nbytes-libpath', | | 378 | + action='store', | | 379 | + dest='shared_nbytes_libpath', | | 380 | + help='a directory to search for the shared nbytes DLL') | | 381 | + | 360 | 382 | shared_optgroup.add_argument('--shared-nghttp2', | 361 | 383 | action='store_true', | 362 | 384 | dest='shared_nghttp2', | @@ -2459,6 +2481,7 @@ def make_bin_override(): | 2459 | 2481 | configure_library('cares', output, pkgname='libcares') | 2460 | 2482 | configure_library('gtest', output) | 2461 | 2483 | configure_library('hdr_histogram', output) | | 2484 | +configure_library('nbytes', output) | 2462 | 2485 | configure_library('nghttp2', output, pkgname='libnghttp2') | 2463 | 2486 | configure_library('nghttp3', output, pkgname='libnghttp3') | 2464 | 2487 | configure_library('ngtcp2', output, pkgname='libngtcp2') | |
Collapse file Copy file name to clipboardExpand all lines: node.gyp +26-5Lines changed: 26 additions & 5 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 18 | 18 | 'node_shared_hdr_histogram%': 'false', | 19 | 19 | 'node_shared_http_parser%': 'false', | 20 | 20 | 'node_shared_libuv%': 'false', | | 21 | + 'node_shared_nbytes%': 'false', | 21 | 22 | 'node_shared_nghttp2%': 'false', | 22 | 23 | 'node_shared_openssl%': 'false', | 23 | 24 | 'node_shared_sqlite%': 'false', | | 873 | 874 | '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h | 874 | 875 | ], | 875 | 876 | 'dependencies': [ | 876 | | - 'deps/nbytes/nbytes.gyp:nbytes', | 877 | 877 | 'tools/v8_gypfiles/abseil.gyp:abseil', | 878 | 878 | 'node_js2c#host', | 879 | 879 | ], | | 945 | 945 | 'deps/histogram/histogram.gyp:histogram', | 946 | 946 | ], | 947 | 947 | }], | | 948 | + [ 'node_shared_nbytes=="false"', { | | 949 | + 'dependencies': [ | | 950 | + 'deps/nbytes/nbytes.gyp:nbytes', | | 951 | + ], | | 952 | + }], | 948 | 953 | [ 'node_use_sqlite=="true"', { | 949 | 954 | 'sources': [ | 950 | 955 | '<@(node_sqlite_sources)', | | 1183 | 1188 | 'type': 'executable', | 1184 | 1189 | 'dependencies': [ | 1185 | 1190 | '<(node_lib_target_name)', | 1186 | | - 'deps/nbytes/nbytes.gyp:nbytes', | 1187 | 1191 | ], | 1188 | 1192 | 'includes': [ | 1189 | 1193 | 'node.gypi' | | 1216 | 1220 | 'deps/histogram/histogram.gyp:histogram', | 1217 | 1221 | ], | 1218 | 1222 | }], | | 1223 | + [ 'node_shared_nbytes=="false"', { | | 1224 | + 'dependencies': [ | | 1225 | + 'deps/nbytes/nbytes.gyp:nbytes', | | 1226 | + ], | | 1227 | + }], | 1219 | 1228 | [ 'node_shared_uvwasi=="false"', { | 1220 | 1229 | 'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ], | 1221 | 1230 | 'include_dirs': [ 'deps/uvwasi/include' ], | | 1239 | 1248 |
| 1240 | 1249 | 'dependencies': [ | 1241 | 1250 | '<(node_lib_target_name)', | 1242 | | - 'deps/nbytes/nbytes.gyp:nbytes', | 1243 | 1251 | 'tools/v8_gypfiles/abseil.gyp:abseil', | 1244 | 1252 | ], | 1245 | 1253 |
| | 1279 | 1287 | 'deps/histogram/histogram.gyp:histogram', | 1280 | 1288 | ], | 1281 | 1289 | }], | | 1290 | + [ 'node_shared_nbytes=="false"', { | | 1291 | + 'dependencies': [ | | 1292 | + 'deps/nbytes/nbytes.gyp:nbytes', | | 1293 | + ], | | 1294 | + }], | 1282 | 1295 | [ 'node_use_openssl=="true"', { | 1283 | 1296 | 'defines': [ | 1284 | 1297 | 'HAVE_OPENSSL=1', | | 1346 | 1359 |
| 1347 | 1360 | 'dependencies': [ | 1348 | 1361 | '<(node_lib_target_name)', | 1349 | | - 'deps/nbytes/nbytes.gyp:nbytes', | 1350 | 1362 | ], | 1351 | 1363 |
| 1352 | 1364 | 'includes': [ | | 1386 | 1398 | 'deps/histogram/histogram.gyp:histogram', | 1387 | 1399 | ], | 1388 | 1400 | }], | | 1401 | + [ 'node_shared_nbytes=="false"', { | | 1402 | + 'dependencies': [ | | 1403 | + 'deps/nbytes/nbytes.gyp:nbytes', | | 1404 | + ], | | 1405 | + }], | 1389 | 1406 | ['OS=="win"', { | 1390 | 1407 | 'libraries': [ | 1391 | 1408 | 'Dbghelp.lib', | | 1472 | 1489 |
| 1473 | 1490 | 'dependencies': [ | 1474 | 1491 | '<(node_lib_target_name)', | 1475 | | - 'deps/nbytes/nbytes.gyp:nbytes', | 1476 | 1492 | ], | 1477 | 1493 |
| 1478 | 1494 | 'includes': [ | | 1509 | 1525 | 'deps/histogram/histogram.gyp:histogram', | 1510 | 1526 | ], | 1511 | 1527 | }], | | 1528 | + [ 'node_shared_nbytes=="false"', { | | 1529 | + 'dependencies': [ | | 1530 | + 'deps/nbytes/nbytes.gyp:nbytes', | | 1531 | + ], | | 1532 | + }], | 1512 | 1533 | [ 'node_use_openssl=="true"', { | 1513 | 1534 | 'dependencies': [ | 1514 | 1535 | 'deps/ncrypto/ncrypto.gyp:ncrypto', | |
Collapse file Copy file name to clipboardExpand all lines: tools/nix/sharedLibDeps.nix +10Lines changed: 10 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 22 | 22 | cares = pkgs.c-ares; | 23 | 23 | hdr-histogram = pkgs.hdrhistogram_c; | 24 | 24 | http-parser = pkgs.llhttp; | | 25 | + nbytes = pkgs.callPackage "${ | | 26 | + pkgs.fetchgit { | | 27 | + url = "https://github.com/NixOS/nixpkgs.git"; | | 28 | + rev = "3146c6aa9995e7351a398e17470e15305e6e18ff"; | | 29 | + sparseCheckout = [ | | 30 | + "/pkgs/by-name/nb/nbytes/" | | 31 | + ]; | | 32 | + hash = "sha256-8cbu4ftn5ke7vd4cniwxuyKl6FRxwdToBj77oyYmsfk="; | | 33 | + } | | 34 | + }/pkgs/by-name/nb/nbytes/package.nix" { }; | 25 | 35 | } | 26 | 36 | // (pkgs.lib.optionalAttrs withSQLite { | 27 | 37 | inherit (pkgs) sqlite; | |
|