package/nodejs: bump version to 18.18.0
PATCH 1/1 package/nodejs: bump version to 18.18.0
- Refactor 0001-add-qemu-wrapper-support.patch for 18.18.0
- NodeJS now requires GCC 8.3 due to the introduction of the charconv header. However, as there is no BR2_TOOLCHAIN_GCC_AT_LEAST_8_3, we round up to BR2_TOOLCHAIN_GCC_AT_LEAST_9.
- Update support/testing/tests/package/test_nodejs.py to use BR2_TOOLCHAIN_EXTERNAL_BOOTLIN, otherwise the test fails as the gcc version selected will be 7.
- Update the hash file for LICENSE.txt due to numerous changes, such as the addition of new libraries and updated dates. No new license types are added.
Signed-off-by Adam Duskett <[email protected]>
--- .../0001-add-qemu-wrapper-support.patch | 25 ++++++++++--------- ...ules-cjs-loader.js-adjust-default-pa.patch | 2 +- package/nodejs/Config.in | 8 +++--- package/nodejs/nodejs.hash | 6 ++--- package/nodejs/nodejs.mk | 2 +- support/testing/tests/package/test_nodejs.py | 2 ++ 6 files changed, 24 insertions(+), 21 deletions(-)
package/nodejs/0001-add-qemu-wrapper-support.patch +13 -12
@@ -16,6 +16,7 @@ the qemu-wrapper on target builds, and remove @MAYBE_WRAPPER@ entirely on host-builds. Signed-off-by: Adam Duskett <[email protected]> +Refresh for 18.18.0 --- node.gyp | 4 ++-- tools/v8_gypfiles/v8.gyp | 10 +++++-----
@@ -25,16 +26,7 @@ diff --git a/node.gyp b/node.gyp index 97cdbb531d..db5cf51ce6 100644 --- a/node.gyp +++ b/node.gyp -@@ -319,7 +319,7 @@ - 'action_name': 'run_mkcodecache', - 'process_outputs_as_sources': 1, - 'inputs': [ -- '<(mkcodecache_exec)', -+ @MAYBE_WRAPPER@ '<(mkcodecache_exec)', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc', -@@ -346,7 +346,7 @@ +@@ -322,7 +322,7 @@ 'action_name': 'node_mksnapshot', 'process_outputs_as_sources': 1, 'inputs': [
@@ -43,6 +35,15 @@ index 97cdbb531d..db5cf51ce6 100644 '<(node_snapshot_main)', ], 'outputs': [ +@@ -342,7 +342,7 @@ + 'action_name': 'node_mksnapshot', + 'process_outputs_as_sources': 1, + 'inputs': [ +- '<(node_mksnapshot_exec)', ++ @MAYBE_WRAPPER@ '<(node_mksnapshot_exec)', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc', diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp index 73099a03e4..88ca91efb4 100644 --- a/tools/v8_gypfiles/v8.gyp
@@ -74,7 +75,7 @@ index 73099a03e4..88ca91efb4 100644 ], 'outputs': [ '<(generate_bytecode_builtins_list_output)', -@@ -395,7 +395,7 @@ +@@ -400,7 +400,7 @@ ], }, 'inputs': [
@@ -83,7 +84,7 @@ index 73099a03e4..88ca91efb4 100644 ], 'outputs': [ '<(INTERMEDIATE_DIR)/snapshot.cc', -@@ -1505,7 +1505,7 @@ +@@ -1569,7 +1569,7 @@ { 'action_name': 'run_gen-regexp-special-case_action', 'inputs': [
package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch +1 -1
@@ -21,7 +21,7 @@ diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loade index f1971c40a4..5fe3884156 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js -@@ -1261,7 +1261,8 @@ Module._initPaths = function() { +@@ -1391,7 +1391,8 @@ Module._initPaths = function() { path.resolve(process.execPath, '..') : path.resolve(process.execPath, '..', '..');
package/nodejs/Config.in +4 -4
@@ -7,19 +7,19 @@ config BR2_PACKAGE_NODEJS_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS -comment "nodejs needs a toolchain w/ C++, dynamic library, NPTL, gcc >= 7, wchar, host gcc >= 8" +comment "nodejs needs a toolchain w/ C++, dynamic library, NPTL, gcc >= 9, wchar, host gcc >= 9" depends on BR2_USE_MMU depends on BR2_PACKAGE_NODEJS_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - !BR2_HOST_GCC_AT_LEAST_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_USE_WCHAR + !BR2_HOST_GCC_AT_LEAST_9 || !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || !BR2_USE_WCHAR config BR2_PACKAGE_NODEJS bool "nodejs" depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_NODEJS_ARCH_SUPPORTS - depends on BR2_HOST_GCC_AT_LEAST_8 # qemu - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 + depends on BR2_HOST_GCC_AT_LEAST_9 # qemu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 depends on BR2_USE_WCHAR # uses fork() depends on BR2_USE_MMU
package/nodejs/nodejs.hash +3 -3
@@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v16.20.0/SHASUMS256.txt -sha256 e0990f992234e40a51fe11f92c3816c93a77e1b081145d3dd762cd1026345349 node-v16.20.0.tar.xz +# From https://nodejs.org/dist/v18.18.0/SHASUMS256.txt +sha256 e4d4dbac3634d99f892f00db47da78f98493c339582e8a95fb2dd59f5cfe0f90 node-v18.18.0.tar.xz # Hash for license file -sha256 ba325815d3df8819bebaf37cad67d6e1f82271e1e4a1189b53abd28e261977d6 LICENSE +sha256 a6871483905199033882d66453649675f0e88ffaa07f9f8acb257ce7504bc758 LICENSE
package/nodejs/nodejs.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 16.20.0 +NODEJS_VERSION = 18.18.0 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = \
support/testing/tests/package/test_nodejs.py +2 -0
@@ -10,6 +10,7 @@ class TestNodeJSBasic(infra.basetest.BRTest): BR2_cortex_a9=y BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_PACKAGE_NODEJS=y BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set
@@ -34,6 +35,7 @@ class TestNodeJSModule(infra.basetest.BRTest): BR2_cortex_a9=y BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_PACKAGE_NODEJS=y BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL="lodash" BR2_TARGET_ROOTFS_CPIO=y
Signature · 6 lines
2.39.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot