From: Jean-Marie LEMETAYER <jean-marie.lemetayer@savoirfairelinux.com>
Date: Fri, 24 Jan 2020 17:07:35 +0000 (+0100)
Subject: classes/npm: force to rebuild the prebuild addons
X-Git-Tag: uninative-2.8~415
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=dc4dda4d459ef66246cb7fb6f7d667c982707544;p=openembedded-core.git

classes/npm: force to rebuild the prebuild addons

This commit forces to rebuild the prebuild addons which are using
node-gyp-build.

  https://www.npmjs.com/package/node-gyp-build

Signed-off-by: Jean-Marie LEMETAYER <jean-marie.lemetayer@savoirfairelinux.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass
index b7c9c40811..068032a1e5 100644
--- a/meta/classes/npm.bbclass
+++ b/meta/classes/npm.bbclass
@@ -216,6 +216,7 @@ python npm_do_compile() {
     dev = bb.utils.to_boolean(d.getVar("NPM_INSTALL_DEV"), False)
 
     with tempfile.TemporaryDirectory() as tmpdir:
+        args = []
         configs = []
 
         if dev:
@@ -240,9 +241,13 @@ python npm_do_compile() {
         pythondir = os.path.join(bindir, "python-native", "python")
         configs.append(("python", pythondir))
 
+        # Add node-pre-gyp configuration
+        args.append(("target_arch", d.getVar("NPM_ARCH")))
+        args.append(("build-from-source", "true"))
+
         # Pack and install the main package
         tarball = npm_pack(env, d.getVar("NPM_PACKAGE"), tmpdir)
-        env.run("npm install %s" % shlex.quote(tarball), configs=configs)
+        env.run("npm install %s" % shlex.quote(tarball), args=args, configs=configs)
 }
 
 npm_do_install() {