2483673439
This updates: * node * node-arduino-firmata * node-cylon * node-hid * node-serialport to their version used in LEDE v17.01.6. This fixes compile errors appearing on Debian Sid. A list of the patches picked from upstream (x'd ones excluded): $ git log --oneline 8ca186cd59..HEAD lang/node lang/node-arduino-firmata/ lang/node-cylon/ lang/node-hid/ lang/node-serialport/ x 4a984a8d6 treewide: replace $(STAGING_DIR)/host and $(HOST_BUILD_PREFIX) with $(STAGING_DIR_HOSTPKG) x 844638d51 Merge pull request #3056 from plntyk/fix_node 0da71b8f8 node: use default host install prefix def97187d Treewide fix of typo: PKG_LICENSE_FILE --> PKG_LICENSE_FILES bc86e32d4 node: fix soft/hard float compile on arm/mips 865f44ef7 node,node-*: node update to v4.4.5 and Enhance CPU-arch variant. a3148b64e node-hid: fix git submodule issue aa9202fac node-hid: fix compile error c9115cdf5 node-*: node update to v4.4.4 x bbce5fce7 node: fix undefined behaviour leading to broken code with GCC 6 9125c3615 node: update to v4.4.4 5a118cda9 node update v0.12.13 x fb744a658 Merge pull request #2486 from yousong/cp-fix bca789b6b node-* : specify npm_config_cache directory ac000220c node-* : specify npm_config_cache directory 47f466e88 node-* : specify npm_config_cache directory 10c6b4110 node-* : specify npm_config_cache directory a82363f0a node-serialport: add node host dependency 0498c8ae2 node-hid: add node host dependency a64623683 node-cylon: add node host dependency 2b8a17de0 node-arduino-firmata: add node host dependency 92b0575e2 Drop the redundant -r option to $(CP) x 9f8e5aca3 treewide: use $(STAGING_DIR)/host instead of $(STAGING_DIR_HOST), sync with changes in trunk e5ca27a97 node: fix build on x86 & x86.64 targets x 659719005 node: add python/host to HOST_BUILD_DEPENDS as well Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
From: Alexandru Ardelean <ardeleanalex@gmail.com>
|
|
Date: Sat, 19 Dec 2015 15:16:02 +0200
|
|
Subject: node: fix build on x86 & x86.64 targets
|
|
|
|
For x86 and x86_64, nodejs has some special CPU
|
|
code that needs to be selected by specifying
|
|
the correct CPU name (correct for nodejs).
|
|
|
|
On OpenWRT x86 is i386 ; node wants ia32 for this.
|
|
And x86_64 is x64 on nodejs.
|
|
|
|
So, we just need to do the proper substitutions.
|
|
|
|
Note: the ARCH env-var is obtained from CONFIG_ARCH, after
|
|
some subtitutions are applied.
|
|
So, it shouldn't affect other target archs.
|
|
|
|
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
|
|
|
|
diff --git a/lang/node/Makefile b/lang/node/Makefile
|
|
index 243c8a5b69ae6bd12b84493de3b26992167f2c17..14741049972a8bd8a15bcf879d3c1294dd754603 100644
|
|
--- a/lang/node/Makefile
|
|
+++ b/lang/node/Makefile
|
|
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=node
|
|
PKG_VERSION:=v0.12.7
|
|
-PKG_RELEASE:=1
|
|
+PKG_RELEASE:=2
|
|
|
|
PKG_SOURCE:=node-$(PKG_VERSION).tar.gz
|
|
PKG_SOURCE_URL:=http://nodejs.org/dist/${PKG_VERSION}
|
|
@@ -40,8 +40,13 @@ define Package/node/description
|
|
package ecosystem, npm, is the largest ecosystem of open source libraries in the world.
|
|
endef
|
|
|
|
+CPU:=$(subst x86_64,x64,$(subst i386,ia32,$(ARCH)))
|
|
+
|
|
+MAKE_VARS += \
|
|
+ DESTCPU=$(CPU)
|
|
+
|
|
CONFIGURE_ARGS= \
|
|
- --dest-cpu=$(CONFIG_ARCH) \
|
|
+ --dest-cpu=$(CPU) \
|
|
--dest-os=linux \
|
|
--without-snapshot \
|
|
--shared-zlib \
|