c1d5eada4d
- Refactor 0001-add-qemu-wrapper-support.patch for 20.9.0 - NodeJS now requires GCC 10.1 header. However, as there is no BR2_TOOLCHAIN_GCC_AT_LEAST_10_1, we round up to BR2_TOOLCHAIN_GCC_AT_LEAST_11. - Drop the --without-dtrace and --without-etw config options as they no longer exist. - 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. Tested with: ./support/testing/run-tests tests.package.test_nodejs Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From a31425bdfcb5d695ab25c3d295898326784cffec Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
Date: Sun, 25 Sep 2022 11:10:06 +0200
|
|
Subject: [PATCH] lib/internal/modules/cjs/loader.js: adjust default path to
|
|
search modules
|
|
|
|
NPM installs modules in /usr/lib/node_modules/, but by default NodeJS
|
|
searches for them only in /usr/lib/node/. We could also set the
|
|
NODE_PATH environment variable, but it is more convienient to have
|
|
NodeJS configured by default to find modules where they are installed.
|
|
|
|
This issue is discussed at
|
|
https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package.
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
---
|
|
lib/internal/modules/cjs/loader.js | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
|
|
index f1971c40a4..5fe3884156 100644
|
|
--- a/lib/internal/modules/cjs/loader.js
|
|
+++ b/lib/internal/modules/cjs/loader.js
|
|
@@ -1378,7 +1378,8 @@ Module._initPaths = function() {
|
|
path.resolve(process.execPath, '..') :
|
|
path.resolve(process.execPath, '..', '..');
|
|
|
|
- const paths = [path.resolve(prefixDir, 'lib', 'node')];
|
|
+ const paths = [path.resolve(prefixDir, 'lib', 'node'),
|
|
+ path.resolve(prefixDir, 'lib', 'node_modules')];
|
|
|
|
if (homeDir) {
|
|
ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries'));
|
|
--
|
|
2.37.3
|
|
|