From: Brendan Le Foll <brendan.le.f...@intel.com>
npm takes a target_arch flag which needs to be set to do some gyp compilations
correctly. It also doesn't use the same mapping as OE for target arch so a
small function is required to make the mapping work. Function is taken from
meta-nodejs
Signed-off-by: Brendan Le Foll <brendan.le.f...@intel.com>
---
meta/classes/npm.bbclass | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass
index 9843e87..d0d3d8f 100644
--- a/meta/classes/npm.bbclass
+++ b/meta/classes/npm.bbclass
@@ -3,6 +3,17 @@ S = "${WORKDIR}/npmpkg"
NPM_INSTALLDIR = "${D}${libdir}/node_modules/${PN}"
+# function maps arch names to npm arch names
+def npm_oe_arch_map(target_arch, d):
+ import re
+ if re.match('p(pc|owerpc)(|64)', target_arch): return 'ppc'
+ elif re.match('i.86$', target_arch): return 'ia32'
+ elif re.match('x86_64$', target_arch): return 'x64'
+ elif re.match('arm64$', target_arch): return 'arm'
+ return target_arch
+
+NPM_ARCH ?= "${@npm_oe_arch_map(d.getVar('TARGET_ARCH', True), d)}"
+
npm_do_compile() {
# changing the home directory to the working directory, the .npmrc will
# be created in this directory
@@ -12,7 +23,7 @@ npm_do_compile() {
# clear cache before every build
npm cache clear
# Install pkg into ${S} without going to the registry
- npm --arch=${TARGET_ARCH} --production --no-registry install
+ npm --arch=${NPM_ARCH} --target_arch=${NPM_ARCH} --production
--no-registry install
}
npm_do_install() {
--
2.8.2
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
