summaryrefslogtreecommitdiff
path: root/meta/classes/npm.bbclass
diff options
context:
space:
mode:
authorBrendan Le Foll <brendan.le.foll@intel.com>2016-05-24 12:12:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-30 09:30:29 +0100
commitf402225311e4bbb62ba9781ab274420abaac0fb4 (patch)
tree9f7cd392f23c11bd1ed4564dc126ab4e845894b4 /meta/classes/npm.bbclass
parent94d80ae33e0671e439c845f25e54aab0ee69843b (diff)
downloadopenembedded-core-f402225311e4bbb62ba9781ab274420abaac0fb4.tar.gz
openembedded-core-f402225311e4bbb62ba9781ab274420abaac0fb4.tar.bz2
openembedded-core-f402225311e4bbb62ba9781ab274420abaac0fb4.zip
npm: add target_arch flag to npm
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.foll@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/npm.bbclass')
-rw-r--r--meta/classes/npm.bbclass13
1 files changed, 12 insertions, 1 deletions
diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass
index 9843e87350..d0d3d8fa03 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() {