diff options
| author |   Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> | 2021-10-08 09:48:33 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-14 11:48:35 +0100 |
| commit | f0a47afb43bd63b66c565ba3d084e20d6725495e (patch) | |
| tree | 1fa316b855e1a10ac3a40156f28ca29a27f17b57 /meta/classes/npm.bbclass | |
| parent | eff85c86f36673a1cb5a5dc8c66598e0dc457374 (diff) | |
| download | openembedded-core-contrib-f0a47afb43bd63b66c565ba3d084e20d6725495e.tar.gz | |
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 <stefan.herbrechtsmeier@weidmueller.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/npm.bbclass')
| -rw-r--r-- | meta/classes/npm.bbclass | 8 |
1 files 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 |