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>
32 lines
901 B
Diff
32 lines
901 B
Diff
From: Dirk Neukirchen <plntyk.lede@plntyk.name>
|
|
Date: Tue, 2 Aug 2016 15:16:33 +0200
|
|
Subject: node: fix soft/hard float compile on arm/mips
|
|
|
|
reported by brcm2708/2709 user on IRC
|
|
|
|
Signed-off-by: Dirk Neukirchen <plntyk.lede@plntyk.name>
|
|
|
|
diff --git a/lang/node/Makefile b/lang/node/Makefile
|
|
index 5cf7a6ec143e0abd19106ba260f6eb16f85b36bf..e1ed0f76f953cf0e505ed4c97839a3009c8d6757 100644
|
|
--- a/lang/node/Makefile
|
|
+++ b/lang/node/Makefile
|
|
@@ -57,7 +57,18 @@ CONFIGURE_ARGS= \
|
|
--shared-openssl \
|
|
--prefix=/usr
|
|
|
|
+ifneq ($(findstring arm,$(ARCH)),)
|
|
+CONFIGURE_ARGS+= \
|
|
+ $(if $(CONFIG_SOFT_FLOAT),--with-arm-float-abi=soft,--with-arm-float-abi=hard)
|
|
+endif
|
|
+
|
|
+ifneq ($(findstring mips,$(ARCH)),)
|
|
+CONFIGURE_ARGS+= \
|
|
+ $(if $(CONFIG_SOFT_FLOAT),--with-mips-float-abi=soft,--with-mips-float-abi=hard)
|
|
+endif
|
|
+
|
|
HOST_CONFIGURE_VARS:=
|
|
+
|
|
HOST_CONFIGURE_ARGS:= \
|
|
--dest-os=linux \
|
|
--without-snapshot \
|