From 14795ee305f3c11fcc31cc7ca815b8ff1020e29a Mon Sep 17 00:00:00 2001 From: Mike Crowe Date: Thu, 13 May 2021 15:25:03 +0100 Subject: npm.bbclass: Allow nodedir to be overridden by NPM_NODEDIR Node modules may need to be built against multiple Node versions. Setting nodedir in the NPM configuration stops older ways of doing this, such as setting npm_config_target and npm_config_disturl, from working. Signed-off-by: Mike Crowe Signed-off-by: Richard Purdie --- meta/classes/npm.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass index 55a6985fb0..8f8712a024 100644 --- a/meta/classes/npm.bbclass +++ b/meta/classes/npm.bbclass @@ -247,8 +247,10 @@ python npm_do_compile() { # Add node-gyp configuration configs.append(("arch", d.getVar("NPM_ARCH"))) configs.append(("release", "true")) - sysroot = d.getVar("RECIPE_SYSROOT_NATIVE") - nodedir = os.path.join(sysroot, d.getVar("prefix_native").strip("/")) + nodedir = d.getVar("NPM_NODEDIR") + if not nodedir: + sysroot = d.getVar("RECIPE_SYSROOT_NATIVE") + nodedir = os.path.join(sysroot, d.getVar("prefix_native").strip("/")) configs.append(("nodedir", nodedir)) configs.append(("python", d.getVar("PYTHON"))) -- cgit 1.2.3-korg