From f0a47afb43bd63b66c565ba3d084e20d6725495e Mon Sep 17 00:00:00 2001 From: Stefan Herbrechtsmeier Date: Fri, 8 Oct 2021 09:48:33 +0200 Subject: [PATCH] npm: Add variable NPM_NODEDIR with default value Replace the variable NPM_NODEDIR fallback to a default value inside the code with a variable NPM_NODEDIR with default value. Signed-off-by: Stefan Herbrechtsmeier Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/classes/npm.bbclass | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass index 477b40d921..05bb9f578d 100644 --- a/meta/classes/npm.bbclass +++ b/meta/classes/npm.bbclass @@ -26,6 +26,8 @@ EXTRA_OENPM = "" NPM_INSTALL_DEV ?= "0" +NPM_NODEDIR ?= "${RECIPE_SYSROOT_NATIVE}${prefix_native}" + def npm_target_arch_map(target_arch): """Maps arch names to npm arch names""" import re @@ -249,11 +251,7 @@ python npm_do_compile() { # Add node-gyp configuration configs.append(("arch", d.getVar("NPM_ARCH"))) configs.append(("release", "true")) - 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(("nodedir", d.getVar("NPM_NODEDIR"))) configs.append(("python", d.getVar("PYTHON"))) # Add node-pre-gyp configuration -- 2.40.1