Skip to contentSkip to conversation

npm.bbclass: Allow nodedir to be overridden by NPM_NODEDIR

PATCH New Mike Crowe 1 participant 1 message May 13, 2021

lore
Share & tools
lore

Mike Crowe

author
#0 lore raw

PATCH 1/1 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.

---
 meta/classes/npm.bbclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta/classes/npm.bbclass +4 -2
index 55a6985fb0..8f8712a024 100644
@@ -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")))
 
Signature · 1 line
2.30.2