[OE-core] [PATCH 10/12] npm: Add variable NPM_NODEDIR with default value

2021-10-08 Thread Stefan Herbrechtsmeier 
From: Stefan Herbrechtsmeier 

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 
---

(no changes since v1)

 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.20.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#156753): 
https://lists.openembedded.org/g/openembedded-core/message/156753
Mute This Topic: https://lists.openembedded.org/mt/86165231/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH 10/12] npm: Add variable NPM_NODEDIR with default value

2021-10-07 Thread Stefan Herbrechtsmeier 
From: Stefan Herbrechtsmeier 

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 
---

 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.20.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#156718): 
https://lists.openembedded.org/g/openembedded-core/message/156718
Mute This Topic: https://lists.openembedded.org/mt/86141422/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-