openwrt: update nodejs to LEDE v17.01.6 to fix compile issues
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>
This commit is contained in:
parent
3275091931
commit
2483673439
@ -1,49 +0,0 @@
|
||||
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
Date: Mon, 9 May 2016 15:57:18 +0200
|
||||
Subject: node: update to v0.12.14
|
||||
|
||||
While we're at it, also enable parallel builds.
|
||||
|
||||
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
|
||||
diff --git a/lang/node/Makefile b/lang/node/Makefile
|
||||
index 243c8a5b69ae6bd12b84493de3b26992167f2c17..ed35e1729bb01bcbb89e43f975940e675d774cde 100644
|
||||
--- a/lang/node/Makefile
|
||||
+++ b/lang/node/Makefile
|
||||
@@ -8,17 +8,21 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=node
|
||||
-PKG_VERSION:=v0.12.7
|
||||
+PKG_VERSION:=v0.12.14
|
||||
PKG_RELEASE:=1
|
||||
|
||||
-PKG_SOURCE:=node-$(PKG_VERSION).tar.gz
|
||||
+PKG_SOURCE:=node-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=http://nodejs.org/dist/${PKG_VERSION}
|
||||
+PKG_MD5SUM:=27f1a2cf00af32cbfe9401ca4b1a805f
|
||||
|
||||
HOST_BUILD_DEPENDS:=python/host
|
||||
PKG_BUILD_DEPENDS:=python/host
|
||||
PKG_INSTALL:=1
|
||||
PKG_USE_MIPS16:=0
|
||||
|
||||
+HOST_BUILD_PARALLEL:=1
|
||||
+PKG_BUILD_PARALLEL:=1
|
||||
+
|
||||
PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
|
||||
PKG_LICENSE:=
|
||||
|
||||
@@ -56,6 +60,12 @@ HOST_CONFIGURE_ARGS:= \
|
||||
|
||||
HOST_CONFIGURE_CMD:=python ./configure
|
||||
|
||||
+HOST_MAKE_FLAGS += CXXFLAGS='-std=c++11'
|
||||
+
|
||||
+define Host/Install
|
||||
+ $(MAKE) -C $(HOST_BUILD_DIR) $(HOST_MAKE_FLAGS) install
|
||||
+endef
|
||||
+
|
||||
define Build/InstallDev
|
||||
$(INSTALL_DIR) $(1)/usr/include
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
|
@ -0,0 +1,47 @@
|
||||
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 \
|
@ -0,0 +1,56 @@
|
||||
From: Yousong Zhou <yszhou4tech@gmail.com>
|
||||
Date: Sat, 12 Mar 2016 01:10:04 +0800
|
||||
Subject: Drop the redundant -r option to $(CP)
|
||||
|
||||
$(CP) was defined as `cp -fpR' since the very begining of OpenWrt build
|
||||
system (2006-06-22). The -R option should be enough and base packages
|
||||
use only $(CP) for the same purposes just fine and BSD manual of cp also
|
||||
discourages the use of `-r' option. So let's just tidy up the usage now.
|
||||
|
||||
[linus.luessing@c0d3.blue: backport, node* only]
|
||||
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
|
||||
|
||||
diff --git a/lang/node-arduino-firmata/Makefile b/lang/node-arduino-firmata/Makefile
|
||||
index aced0701287475e245a185f969b71232cf3ee6e0..73e8da126c5fc068f5af332cfde683449d16c849 100644
|
||||
--- a/lang/node-arduino-firmata/Makefile
|
||||
+++ b/lang/node-arduino-firmata/Makefile
|
||||
@@ -60,7 +60,7 @@ define Package/node-arduino-firmata/install
|
||||
mkdir -p $(1)/usr/lib/node
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/* $(1)/usr/lib/node
|
||||
rm -rf $(1)/usr/lib/node/arduino-firmata/node_modules/serialport/
|
||||
- $(CP) -r ./files/* $(1)/
|
||||
+ $(CP) ./files/* $(1)/
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,node-arduino-firmata))
|
||||
diff --git a/lang/node-cylon/Makefile b/lang/node-cylon/Makefile
|
||||
index 753ae2319b103e392297c8cf63c915cc2fcd3453..c2e3b7265d11316dabd22dbf0f6ea8ee83fdeb5a 100644
|
||||
--- a/lang/node-cylon/Makefile
|
||||
+++ b/lang/node-cylon/Makefile
|
||||
@@ -73,22 +73,22 @@ endef
|
||||
|
||||
define Package/node-cylon/install
|
||||
mkdir -p $(1)/usr/lib/node/cylon
|
||||
- $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/node_modules/cylon/* $(1)/usr/lib/node/cylon/
|
||||
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/node_modules/cylon/* $(1)/usr/lib/node/cylon/
|
||||
endef
|
||||
|
||||
define Package/node-cylon-i2c/install
|
||||
mkdir -p $(1)/usr/lib/node/cylon-i2c
|
||||
- $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/node_modules/cylon-i2c/* $(1)/usr/lib/node/cylon-i2c/
|
||||
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/node_modules/cylon-i2c/* $(1)/usr/lib/node/cylon-i2c/
|
||||
endef
|
||||
|
||||
define Package/node-cylon-gpio/install
|
||||
mkdir -p $(1)/usr/lib/node/cylon-gpio
|
||||
- $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/node_modules/cylon-gpio/* $(1)/usr/lib/node/cylon-gpio/
|
||||
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/node_modules/cylon-gpio/* $(1)/usr/lib/node/cylon-gpio/
|
||||
endef
|
||||
|
||||
define Package/node-cylon-firmata/install
|
||||
mkdir -p $(1)/usr/lib/node/cylon-firmata
|
||||
- $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/{index.js,lib,LICENSE,package.json,README.md,RELEASES.md,spec} $(1)/usr/lib/node/cylon-firmata/
|
||||
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/{index.js,lib,LICENSE,package.json,README.md,RELEASES.md,spec} $(1)/usr/lib/node/cylon-firmata/
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,node-cylon))
|
@ -0,0 +1,19 @@
|
||||
From: Stijn Tintel <stijn@linux-ipv6.be>
|
||||
Date: Thu, 17 Mar 2016 10:34:56 +0100
|
||||
Subject: node-arduino-firmata: add node host dependency
|
||||
|
||||
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
|
||||
|
||||
diff --git a/lang/node-arduino-firmata/Makefile b/lang/node-arduino-firmata/Makefile
|
||||
index 73e8da126c5fc068f5af332cfde683449d16c849..96d120f5698a783e54384b05c32d11ed9b1bd319 100644
|
||||
--- a/lang/node-arduino-firmata/Makefile
|
||||
+++ b/lang/node-arduino-firmata/Makefile
|
||||
@@ -18,7 +18,7 @@ PKG_SOURCE_VERSION:=16e76007edf218d72df590adbd711ac6b7432845
|
||||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
|
||||
|
||||
-PKG_BUILD_DEPENDS:=node
|
||||
+PKG_BUILD_DEPENDS:=node/host
|
||||
PKG_NODE_VERSION:=0.12.7
|
||||
|
||||
PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
|
@ -0,0 +1,19 @@
|
||||
From: Stijn Tintel <stijn@linux-ipv6.be>
|
||||
Date: Thu, 17 Mar 2016 10:35:53 +0100
|
||||
Subject: node-cylon: add node host dependency
|
||||
|
||||
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
|
||||
|
||||
diff --git a/lang/node-cylon/Makefile b/lang/node-cylon/Makefile
|
||||
index c2e3b7265d11316dabd22dbf0f6ea8ee83fdeb5a..d2ed0a0a25c65e8b13536dc1c44b498743766ef7 100644
|
||||
--- a/lang/node-cylon/Makefile
|
||||
+++ b/lang/node-cylon/Makefile
|
||||
@@ -18,7 +18,7 @@ PKG_SOURCE_VERSION:=0c37da77e48b3e2cc3a8d566822a17689de91b40
|
||||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
|
||||
|
||||
-PKG_BUILD_DEPENDS:=node
|
||||
+PKG_BUILD_DEPENDS:=node/host
|
||||
PKG_NODE_VERSION:=0.12.7
|
||||
|
||||
PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
|
@ -0,0 +1,19 @@
|
||||
From: Stijn Tintel <stijn@linux-ipv6.be>
|
||||
Date: Thu, 17 Mar 2016 10:36:47 +0100
|
||||
Subject: node-hid: add node host dependency
|
||||
|
||||
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
|
||||
|
||||
diff --git a/lang/node-hid/Makefile b/lang/node-hid/Makefile
|
||||
index 911e2a4cc695004d4ee4ee3d3078fc7d1876bee2..fbb7ed00eebef2fcf2b63175acc53b0b77a71e5c 100644
|
||||
--- a/lang/node-hid/Makefile
|
||||
+++ b/lang/node-hid/Makefile
|
||||
@@ -18,7 +18,7 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
||||
PKG_SOURCE_VERSION:=c56c8aa5d113c6f2574d1f7e64d41745702965bb
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
|
||||
|
||||
-PKG_BUILD_DEPENDS:=node
|
||||
+PKG_BUILD_DEPENDS:=node/host
|
||||
PKG_NODE_VERSION:=0.12.7
|
||||
|
||||
PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
|
@ -0,0 +1,19 @@
|
||||
From: Stijn Tintel <stijn@linux-ipv6.be>
|
||||
Date: Thu, 17 Mar 2016 10:37:10 +0100
|
||||
Subject: node-serialport: add node host dependency
|
||||
|
||||
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
|
||||
|
||||
diff --git a/lang/node-serialport/Makefile b/lang/node-serialport/Makefile
|
||||
index ad4b7aff604543fdfd5a443064552c5fa8fbc472..1f75a36850125a42d88915d83a053d8b35d49577 100644
|
||||
--- a/lang/node-serialport/Makefile
|
||||
+++ b/lang/node-serialport/Makefile
|
||||
@@ -16,7 +16,7 @@ PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz
|
||||
PKG_SOURCE_URL:=http://registry.npmjs.org/$(PKG_NPM_NAME)/-/
|
||||
PKG_MD5SUM:=1eb21082e0aa676b8350182a60230808
|
||||
|
||||
-PKG_BUILD_DEPENDS:=node
|
||||
+PKG_BUILD_DEPENDS:=node/host
|
||||
PKG_NODE_VERSION:=0.12.7
|
||||
|
||||
PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
|
@ -0,0 +1,16 @@
|
||||
From: Hirokazu MORIKAWA <register@nxhack.com>
|
||||
Date: Fri, 1 Apr 2016 13:46:31 +0900
|
||||
Subject: node-* : specify npm_config_cache directory
|
||||
|
||||
diff --git a/lang/node-arduino-firmata/Makefile b/lang/node-arduino-firmata/Makefile
|
||||
index 96d120f5698a783e54384b05c32d11ed9b1bd319..89e9637be980fff6c216ba62d1bd617d63e2e130 100644
|
||||
--- a/lang/node-arduino-firmata/Makefile
|
||||
+++ b/lang/node-arduino-firmata/Makefile
|
||||
@@ -52,6 +52,7 @@ define Build/Compile
|
||||
$(MAKE_FLAGS) \
|
||||
npm_config_arch=$(CONFIG_ARCH) \
|
||||
npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \
|
||||
+ npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache \
|
||||
PREFIX="$(PKG_INSTALL_DIR)/usr/" \
|
||||
$(STAGING_DIR_HOST)/bin/npm install -g $(PKG_BUILD_DIR)
|
||||
endef
|
@ -0,0 +1,16 @@
|
||||
From: Hirokazu MORIKAWA <register@nxhack.com>
|
||||
Date: Fri, 1 Apr 2016 13:47:59 +0900
|
||||
Subject: node-* : specify npm_config_cache directory
|
||||
|
||||
diff --git a/lang/node-cylon/Makefile b/lang/node-cylon/Makefile
|
||||
index d2ed0a0a25c65e8b13536dc1c44b498743766ef7..e64a4d5b5c4dcc825574838ed21eadf7a7f9e3f3 100644
|
||||
--- a/lang/node-cylon/Makefile
|
||||
+++ b/lang/node-cylon/Makefile
|
||||
@@ -67,6 +67,7 @@ define Build/Compile
|
||||
$(MAKE_FLAGS) \
|
||||
npm_config_arch=$(CONFIG_ARCH) \
|
||||
npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \
|
||||
+ npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache \
|
||||
PREFIX="$(PKG_INSTALL_DIR)/usr/" \
|
||||
$(STAGING_DIR_HOST)/bin/npm install -g $(PKG_BUILD_DIR)
|
||||
endef
|
@ -0,0 +1,16 @@
|
||||
From: Hirokazu MORIKAWA <register@nxhack.com>
|
||||
Date: Fri, 1 Apr 2016 13:48:46 +0900
|
||||
Subject: node-* : specify npm_config_cache directory
|
||||
|
||||
diff --git a/lang/node-hid/Makefile b/lang/node-hid/Makefile
|
||||
index fbb7ed00eebef2fcf2b63175acc53b0b77a71e5c..471d31e873d86031ccbc451c896d50077995f8f2 100644
|
||||
--- a/lang/node-hid/Makefile
|
||||
+++ b/lang/node-hid/Makefile
|
||||
@@ -49,6 +49,7 @@ define Build/Compile
|
||||
$(MAKE_FLAGS) \
|
||||
npm_config_arch=$(CONFIG_ARCH) \
|
||||
npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \
|
||||
+ npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache \
|
||||
PREFIX="$(PKG_INSTALL_DIR)/usr/" \
|
||||
$(STAGING_DIR_HOST)/bin/npm install -g $(PKG_BUILD_DIR)
|
||||
endef
|
@ -0,0 +1,16 @@
|
||||
From: Hirokazu MORIKAWA <register@nxhack.com>
|
||||
Date: Fri, 1 Apr 2016 13:49:16 +0900
|
||||
Subject: node-* : specify npm_config_cache directory
|
||||
|
||||
diff --git a/lang/node-serialport/Makefile b/lang/node-serialport/Makefile
|
||||
index 1f75a36850125a42d88915d83a053d8b35d49577..c39735f32fbc51d09155f074a264a2319c895b2b 100644
|
||||
--- a/lang/node-serialport/Makefile
|
||||
+++ b/lang/node-serialport/Makefile
|
||||
@@ -49,6 +49,7 @@ define Build/Compile
|
||||
$(MAKE_FLAGS) \
|
||||
npm_config_arch=$(CONFIG_ARCH) \
|
||||
npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \
|
||||
+ npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache \
|
||||
PREFIX="$(PKG_INSTALL_DIR)/usr/" \
|
||||
$(STAGING_DIR_HOST)/bin/npm install -g $(PKG_BUILD_DIR)
|
||||
endef
|
113
patches/packages/openwrt/0017-node-update-v0.12.13.patch
Normal file
113
patches/packages/openwrt/0017-node-update-v0.12.13.patch
Normal file
@ -0,0 +1,113 @@
|
||||
From: Hirokazu MORIKAWA <register@nxhack.com>
|
||||
Date: Thu, 21 Apr 2016 16:43:14 +0900
|
||||
Subject: node update v0.12.13
|
||||
|
||||
diff --git a/lang/node-arduino-firmata/Makefile b/lang/node-arduino-firmata/Makefile
|
||||
index 89e9637be980fff6c216ba62d1bd617d63e2e130..9fca861f6a0b6f649bbad932da57735fe509dbfe 100644
|
||||
--- a/lang/node-arduino-firmata/Makefile
|
||||
+++ b/lang/node-arduino-firmata/Makefile
|
||||
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||
PKG_NPM_NAME:=arduino-firmata
|
||||
PKG_NAME:=node-$(PKG_NPM_NAME)
|
||||
PKG_VERSION:=0.3.3
|
||||
-PKG_RELEASE:=1
|
||||
+PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/shokai/node-arduino-firmata.git
|
||||
@@ -19,7 +19,7 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
|
||||
|
||||
PKG_BUILD_DEPENDS:=node/host
|
||||
-PKG_NODE_VERSION:=0.12.7
|
||||
+PKG_NODE_VERSION:=0.12.13
|
||||
|
||||
PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
|
||||
PKG_LICENSE:=MIT
|
||||
diff --git a/lang/node-cylon/Makefile b/lang/node-cylon/Makefile
|
||||
index e64a4d5b5c4dcc825574838ed21eadf7a7f9e3f3..63b8220e50065fcd3d7c225881475dee13d69432 100644
|
||||
--- a/lang/node-cylon/Makefile
|
||||
+++ b/lang/node-cylon/Makefile
|
||||
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||
PKG_NPM_NAME:=cylon
|
||||
PKG_NAME:=node-$(PKG_NPM_NAME)
|
||||
PKG_VERSION:=0.22.0
|
||||
-PKG_RELEASE:=1
|
||||
+PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/hybridgroup/cylon-firmata.git
|
||||
@@ -19,7 +19,7 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
|
||||
|
||||
PKG_BUILD_DEPENDS:=node/host
|
||||
-PKG_NODE_VERSION:=0.12.7
|
||||
+PKG_NODE_VERSION:=0.12.13
|
||||
|
||||
PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
|
||||
PKG_LICENSE:=Apache-2.0
|
||||
diff --git a/lang/node-hid/Makefile b/lang/node-hid/Makefile
|
||||
index 471d31e873d86031ccbc451c896d50077995f8f2..777d5eafd60bdc86a7ba464aac70b1b664503893 100644
|
||||
--- a/lang/node-hid/Makefile
|
||||
+++ b/lang/node-hid/Makefile
|
||||
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||
PKG_NPM_NAME:=hid
|
||||
PKG_NAME:=node-$(PKG_NPM_NAME)
|
||||
PKG_VERSION:=0.4.0
|
||||
-PKG_RELEASE:=1
|
||||
+PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/node-hid/node-hid.git
|
||||
@@ -19,7 +19,7 @@ PKG_SOURCE_VERSION:=c56c8aa5d113c6f2574d1f7e64d41745702965bb
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
|
||||
|
||||
PKG_BUILD_DEPENDS:=node/host
|
||||
-PKG_NODE_VERSION:=0.12.7
|
||||
+PKG_NODE_VERSION:=0.12.13
|
||||
|
||||
PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
|
||||
PKG_LICENSE:=Custom
|
||||
diff --git a/lang/node-serialport/Makefile b/lang/node-serialport/Makefile
|
||||
index c39735f32fbc51d09155f074a264a2319c895b2b..a732174731ceebdb889acd7df9a79914cf2b9220 100644
|
||||
--- a/lang/node-serialport/Makefile
|
||||
+++ b/lang/node-serialport/Makefile
|
||||
@@ -10,14 +10,14 @@ include $(TOPDIR)/rules.mk
|
||||
PKG_NPM_NAME:=serialport
|
||||
PKG_NAME:=node-$(PKG_NPM_NAME)
|
||||
PKG_VERSION:=1.4.6
|
||||
-PKG_RELEASE:=1
|
||||
+PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz
|
||||
PKG_SOURCE_URL:=http://registry.npmjs.org/$(PKG_NPM_NAME)/-/
|
||||
PKG_MD5SUM:=1eb21082e0aa676b8350182a60230808
|
||||
|
||||
PKG_BUILD_DEPENDS:=node/host
|
||||
-PKG_NODE_VERSION:=0.12.7
|
||||
+PKG_NODE_VERSION:=0.12.13
|
||||
|
||||
PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
|
||||
PKG_LICENSE:=Custom
|
||||
diff --git a/lang/node/Makefile b/lang/node/Makefile
|
||||
index 14741049972a8bd8a15bcf879d3c1294dd754603..37da18ce83285882208fc303a9c29bd64f279042 100644
|
||||
--- a/lang/node/Makefile
|
||||
+++ b/lang/node/Makefile
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
-# Copyright (C) 2006-2011 OpenWrt.org
|
||||
+# Copyright (C) 2006-2016 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
@@ -8,8 +8,8 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=node
|
||||
-PKG_VERSION:=v0.12.7
|
||||
-PKG_RELEASE:=2
|
||||
+PKG_VERSION:=v0.12.13
|
||||
+PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=node-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=http://nodejs.org/dist/${PKG_VERSION}
|
110
patches/packages/openwrt/0018-node-update-to-v4.4.4.patch
Normal file
110
patches/packages/openwrt/0018-node-update-to-v4.4.4.patch
Normal file
@ -0,0 +1,110 @@
|
||||
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
Date: Mon, 9 May 2016 15:57:18 +0200
|
||||
Subject: node: update to v4.4.4
|
||||
|
||||
While we're at it, also enable parallel builds.
|
||||
|
||||
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
|
||||
diff --git a/lang/node/Makefile b/lang/node/Makefile
|
||||
index 37da18ce83285882208fc303a9c29bd64f279042..a95aecb3aca1e52e29e4f151ffd28ef361bf1336 100644
|
||||
--- a/lang/node/Makefile
|
||||
+++ b/lang/node/Makefile
|
||||
@@ -8,17 +8,21 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=node
|
||||
-PKG_VERSION:=v0.12.13
|
||||
+PKG_VERSION:=v4.4.4
|
||||
PKG_RELEASE:=1
|
||||
|
||||
-PKG_SOURCE:=node-$(PKG_VERSION).tar.gz
|
||||
+PKG_SOURCE:=node-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=http://nodejs.org/dist/${PKG_VERSION}
|
||||
+PKG_MD5SUM:=1ad7915688df85f62a57f43860dc54c6
|
||||
|
||||
HOST_BUILD_DEPENDS:=python/host
|
||||
PKG_BUILD_DEPENDS:=python/host
|
||||
PKG_INSTALL:=1
|
||||
PKG_USE_MIPS16:=0
|
||||
|
||||
+HOST_BUILD_PARALLEL:=1
|
||||
+PKG_BUILD_PARALLEL:=1
|
||||
+
|
||||
PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
|
||||
PKG_LICENSE:=
|
||||
|
||||
@@ -31,7 +35,7 @@ define Package/node
|
||||
SUBMENU:=Node.js
|
||||
TITLE:=Node.js is a platform built on Chrome's JavaScript runtime
|
||||
URL:=http://nodejs.org/
|
||||
- DEPENDS:=+libpthread +librt +libstdcpp +libopenssl +libuv
|
||||
+ DEPENDS:=+libpthread +librt +libstdcpp +libopenssl +libuv +zlib
|
||||
endef
|
||||
|
||||
define Package/node/description
|
||||
diff --git a/lang/node/patches/001-hardfloat.patch b/lang/node/patches/001-hardfloat.patch
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..1bb24930f39e5972df72e49371994bc2debe78f6
|
||||
--- /dev/null
|
||||
+++ b/lang/node/patches/001-hardfloat.patch
|
||||
@@ -0,0 +1,12 @@
|
||||
+diff --git a/deps/v8/src/base/cpu.cc b/deps/v8/src/base/cpu.cc
|
||||
+index 4f58720..1f3071e 100644
|
||||
+--- a/deps/v8/src/base/cpu.cc
|
||||
++++ b/deps/v8/src/base/cpu.cc
|
||||
+@@ -143,6 +143,7 @@ int __detect_fp64_mode(void) {
|
||||
+ ".set push\n\t"
|
||||
+ ".set noreorder\n\t"
|
||||
+ ".set oddspreg\n\t"
|
||||
++ ".set hardfloat\n\t"
|
||||
+ "lui $t0, 0x3FF0\n\t"
|
||||
+ "ldc1 $f0, %0\n\t"
|
||||
+ "mtc1 $t0, $f1\n\t"
|
||||
diff --git a/lang/node/patches/001-mips-no-fpu.patch b/lang/node/patches/001-mips-no-fpu.patch
|
||||
deleted file mode 100644
|
||||
index 5bf8142ccaea10523419412940e52e036a2f8735..0000000000000000000000000000000000000000
|
||||
--- a/lang/node/patches/001-mips-no-fpu.patch
|
||||
+++ /dev/null
|
||||
@@ -1,15 +0,0 @@
|
||||
---- a/deps/v8/build/toolchain.gypi
|
||||
-+++ b/deps/v8/build/toolchain.gypi
|
||||
-@@ -50,10 +50,10 @@
|
||||
- 'arm_test_noprobe%': 'off',
|
||||
-
|
||||
- # Similar to vfp but on MIPS.
|
||||
-- 'v8_can_use_fpu_instructions%': 'true',
|
||||
-+ 'v8_can_use_fpu_instructions%': 'false',
|
||||
-
|
||||
- # Similar to the ARM hard float ABI but on MIPS.
|
||||
-- 'v8_use_mips_abi_hardfloat%': 'true',
|
||||
-+ 'v8_use_mips_abi_hardfloat%': 'false',
|
||||
-
|
||||
- # Default arch variant for MIPS.
|
||||
- 'mips_arch_variant%': 'r2',
|
||||
diff --git a/lang/node/patches/002-addr_info.patch b/lang/node/patches/002-addr_info.patch
|
||||
index 78225db55b9c96ac60a1d55478aecbfdec80abc9..0aa02dac231eee5ed15aff9710aa0d40990b3a60 100644
|
||||
--- a/lang/node/patches/002-addr_info.patch
|
||||
+++ b/lang/node/patches/002-addr_info.patch
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/deps/uv/src/unix/getaddrinfo.c
|
||||
+++ b/deps/uv/src/unix/getaddrinfo.c
|
||||
-@@ -99,6 +99,7 @@
|
||||
+@@ -99,6 +99,7 @@ static void uv__getaddrinfo_work(struct
|
||||
int err;
|
||||
|
||||
req = container_of(w, uv_getaddrinfo_t, work_req);
|
||||
diff --git a/lang/node/patches/003-path.patch b/lang/node/patches/003-path.patch
|
||||
index 723fe9da7dbcbcd0e1e8c7278100f68440462e57..01a71c6a31a76987a2eae706912f58b6d08344d8 100644
|
||||
--- a/lang/node/patches/003-path.patch
|
||||
+++ b/lang/node/patches/003-path.patch
|
||||
@@ -1,7 +1,7 @@
|
||||
--- a/lib/module.js
|
||||
+++ b/lib/module.js
|
||||
-@@ -512,7 +512,8 @@
|
||||
- var homeDir = process.env.HOME;
|
||||
+@@ -453,7 +453,8 @@ Module._initPaths = function() {
|
||||
+ homeDir = process.env.HOME;
|
||||
}
|
||||
|
||||
- var paths = [path.resolve(process.execPath, '..', '..', 'lib', 'node')];
|
2622
patches/packages/openwrt/0019-node-node-update-to-v4.4.4.patch
Normal file
2622
patches/packages/openwrt/0019-node-node-update-to-v4.4.4.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,27 @@
|
||||
From: Hirokazu MORIKAWA <register@nxhack.com>
|
||||
Date: Wed, 18 May 2016 14:54:38 +0900
|
||||
Subject: node-hid: fix compile error
|
||||
|
||||
diff --git a/lang/node-hid/Makefile b/lang/node-hid/Makefile
|
||||
index 5a243a255a9a19071b62c540a6fafd10cf0628f9..f9ad54e7ac1b46e6536753823ae7fbbcfac23b30 100644
|
||||
--- a/lang/node-hid/Makefile
|
||||
+++ b/lang/node-hid/Makefile
|
||||
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||
PKG_NPM_NAME:=hid
|
||||
PKG_NAME:=node-$(PKG_NPM_NAME)
|
||||
PKG_VERSION:=0.5.1
|
||||
-PKG_RELEASE:=1
|
||||
+PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/node-hid/node-hid.git
|
||||
@@ -43,8 +43,7 @@ endef
|
||||
|
||||
CPU:=$(subst x86_64,x64,$(subst i386,ia32,$(ARCH)))
|
||||
|
||||
-EXTRA_LDFLAGS+="-lhidapi-libusb"
|
||||
-EXTRA_CFLAGS+="-I$(STAGING_DIR)/usr/include/hidapi/"
|
||||
+EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include/libusb-1.0
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE_VARS) \
|
@ -0,0 +1,25 @@
|
||||
From: Hirokazu MORIKAWA <register@nxhack.com>
|
||||
Date: Mon, 23 May 2016 14:49:29 +0900
|
||||
Subject: node-hid: fix git submodule issue
|
||||
|
||||
diff --git a/lang/node-hid/Makefile b/lang/node-hid/Makefile
|
||||
index f9ad54e7ac1b46e6536753823ae7fbbcfac23b30..e28298b8421794f5862ed026faf0d5023713c7b3 100644
|
||||
--- a/lang/node-hid/Makefile
|
||||
+++ b/lang/node-hid/Makefile
|
||||
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||
PKG_NPM_NAME:=hid
|
||||
PKG_NAME:=node-$(PKG_NPM_NAME)
|
||||
PKG_VERSION:=0.5.1
|
||||
-PKG_RELEASE:=2
|
||||
+PKG_RELEASE:=3
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/node-hid/node-hid.git
|
||||
@@ -46,6 +46,7 @@ CPU:=$(subst x86_64,x64,$(subst i386,ia32,$(ARCH)))
|
||||
EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include/libusb-1.0
|
||||
|
||||
define Build/Compile
|
||||
+ git init $(PKG_BUILD_DIR)
|
||||
$(MAKE_VARS) \
|
||||
$(MAKE_FLAGS) \
|
||||
npm_config_arch=$(CONFIG_ARCH) \
|
@ -0,0 +1,202 @@
|
||||
From: Hirokazu MORIKAWA <register@nxhack.com>
|
||||
Date: Fri, 27 May 2016 16:22:39 +0900
|
||||
Subject: node,node-*: node update to v4.4.5 and Enhance CPU-arch variant.
|
||||
|
||||
[linus.luessing@c0d3.blue: backport]
|
||||
Conflicts:
|
||||
lang/node/patches/004-gcc6-undefined-behaviour.patch
|
||||
|
||||
diff --git a/lang/node-arduino-firmata/Makefile b/lang/node-arduino-firmata/Makefile
|
||||
index 5dc300e0e271ca0161547012b4de2a5954835965..3273f9760c929eeda47f93229a7aae3b19a5f874 100644
|
||||
--- a/lang/node-arduino-firmata/Makefile
|
||||
+++ b/lang/node-arduino-firmata/Makefile
|
||||
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||
PKG_NPM_NAME:=arduino-firmata
|
||||
PKG_NAME:=node-$(PKG_NPM_NAME)
|
||||
PKG_VERSION:=0.3.3
|
||||
-PKG_RELEASE:=3
|
||||
+PKG_RELEASE:=4
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/shokai/node-arduino-firmata.git
|
||||
@@ -19,7 +19,7 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
|
||||
|
||||
PKG_BUILD_DEPENDS:=node/host
|
||||
-PKG_NODE_VERSION:=4.4.4
|
||||
+PKG_NODE_VERSION:=4.4.5
|
||||
|
||||
PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
|
||||
PKG_LICENSE:=MIT
|
||||
diff --git a/lang/node-cylon/Makefile b/lang/node-cylon/Makefile
|
||||
index 8c73e8e7d29b4e95b9c549cc8603f690bfcd3edb..dca44522e4c19fd180e5b5682592567f08a1e4f1 100644
|
||||
--- a/lang/node-cylon/Makefile
|
||||
+++ b/lang/node-cylon/Makefile
|
||||
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||
PKG_NPM_NAME:=cylon
|
||||
PKG_NAME:=node-$(PKG_NPM_NAME)
|
||||
PKG_VERSION:=0.22.0
|
||||
-PKG_RELEASE:=3
|
||||
+PKG_RELEASE:=4
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/hybridgroup/cylon-firmata.git
|
||||
@@ -19,7 +19,7 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
|
||||
|
||||
PKG_BUILD_DEPENDS:=node/host
|
||||
-PKG_NODE_VERSION:=4.4.4
|
||||
+PKG_NODE_VERSION:=4.4.5
|
||||
|
||||
PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
|
||||
PKG_LICENSE:=Apache-2.0
|
||||
diff --git a/lang/node-hid/Makefile b/lang/node-hid/Makefile
|
||||
index e28298b8421794f5862ed026faf0d5023713c7b3..7431cd5f22880bfea4ca8e10cf4d314f93ac050d 100644
|
||||
--- a/lang/node-hid/Makefile
|
||||
+++ b/lang/node-hid/Makefile
|
||||
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||
PKG_NPM_NAME:=hid
|
||||
PKG_NAME:=node-$(PKG_NPM_NAME)
|
||||
PKG_VERSION:=0.5.1
|
||||
-PKG_RELEASE:=3
|
||||
+PKG_RELEASE:=4
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/node-hid/node-hid.git
|
||||
@@ -19,7 +19,7 @@ PKG_SOURCE_VERSION:=35d830b7810c87d32484d0a346621568c4849441
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
|
||||
|
||||
PKG_BUILD_DEPENDS:=node/host
|
||||
-PKG_NODE_VERSION:=4.4.4
|
||||
+PKG_NODE_VERSION:=4.4.5
|
||||
|
||||
PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
|
||||
PKG_LICENSE:=Custom
|
||||
diff --git a/lang/node-serialport/Makefile b/lang/node-serialport/Makefile
|
||||
index fd292d706ef1d92a4c825849b755dbfb85b4bdd6..c45149166b1e43e98be7f2cbb7159017874540d6 100644
|
||||
--- a/lang/node-serialport/Makefile
|
||||
+++ b/lang/node-serialport/Makefile
|
||||
@@ -10,14 +10,14 @@ include $(TOPDIR)/rules.mk
|
||||
PKG_NPM_NAME:=serialport
|
||||
PKG_NAME:=node-$(PKG_NPM_NAME)
|
||||
PKG_VERSION:=3.0.0
|
||||
-PKG_RELEASE:=1
|
||||
+PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz
|
||||
PKG_SOURCE_URL:=http://registry.npmjs.org/$(PKG_NPM_NAME)/-/
|
||||
PKG_MD5SUM:=ea20a17746dd64e72d5f6f2019d9e28d
|
||||
|
||||
PKG_BUILD_DEPENDS:=node/host
|
||||
-PKG_NODE_VERSION:=4.4.4
|
||||
+PKG_NODE_VERSION:=4.4.5
|
||||
|
||||
PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
|
||||
PKG_LICENSE:=Custom
|
||||
diff --git a/lang/node/Makefile b/lang/node/Makefile
|
||||
index a95aecb3aca1e52e29e4f151ffd28ef361bf1336..5cf7a6ec143e0abd19106ba260f6eb16f85b36bf 100644
|
||||
--- a/lang/node/Makefile
|
||||
+++ b/lang/node/Makefile
|
||||
@@ -8,12 +8,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=node
|
||||
-PKG_VERSION:=v4.4.4
|
||||
+PKG_VERSION:=v4.4.5
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=node-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=http://nodejs.org/dist/${PKG_VERSION}
|
||||
-PKG_MD5SUM:=1ad7915688df85f62a57f43860dc54c6
|
||||
+PKG_MD5SUM:=376140907bbe362f36065a30af04f020
|
||||
|
||||
HOST_BUILD_DEPENDS:=python/host
|
||||
PKG_BUILD_DEPENDS:=python/host
|
||||
@@ -35,7 +35,7 @@ define Package/node
|
||||
SUBMENU:=Node.js
|
||||
TITLE:=Node.js is a platform built on Chrome's JavaScript runtime
|
||||
URL:=http://nodejs.org/
|
||||
- DEPENDS:=+libpthread +librt +libstdcpp +libopenssl +libuv +zlib
|
||||
+ DEPENDS:=+libpthread +librt +libstdcpp +libopenssl +zlib
|
||||
endef
|
||||
|
||||
define Package/node/description
|
||||
@@ -44,7 +44,7 @@ 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)))
|
||||
+CPU:=$(subst aarch64,arm64,$(subst x86_64,x64,$(subst i386,ia32,$(ARCH))))
|
||||
|
||||
MAKE_VARS += \
|
||||
DESTCPU=$(CPU)
|
||||
diff --git a/lang/node/patches/004-gcc6-undefined-behaviour.patch b/lang/node/patches/004-gcc6-undefined-behaviour.patch
|
||||
deleted file mode 100644
|
||||
index dbbbcf0c54bb62f643521411668772531d42b89a..0000000000000000000000000000000000000000
|
||||
--- a/lang/node/patches/004-gcc6-undefined-behaviour.patch
|
||||
+++ /dev/null
|
||||
@@ -1,64 +0,0 @@
|
||||
-diff --git a/deps/v8/src/heap/incremental-marking.cc b/deps/v8/src/heap/incremental-marking.cc
|
||||
-index c922e83..2ead8be 100644
|
||||
---- a/deps/v8/src/heap/incremental-marking.cc
|
||||
-+++ b/deps/v8/src/heap/incremental-marking.cc
|
||||
-@@ -379,7 +379,7 @@ void IncrementalMarking::DeactivateIncrementalWriteBarrier() {
|
||||
- DeactivateIncrementalWriteBarrierForSpace(heap_->new_space());
|
||||
-
|
||||
- LargePage* lop = heap_->lo_space()->first_page();
|
||||
-- while (lop->is_valid()) {
|
||||
-+ while (LargePage::IsValid(lop)) {
|
||||
- SetOldSpacePageFlags(lop, false, false);
|
||||
- lop = lop->next_page();
|
||||
- }
|
||||
-@@ -414,7 +414,7 @@ void IncrementalMarking::ActivateIncrementalWriteBarrier() {
|
||||
- ActivateIncrementalWriteBarrier(heap_->new_space());
|
||||
-
|
||||
- LargePage* lop = heap_->lo_space()->first_page();
|
||||
-- while (lop->is_valid()) {
|
||||
-+ while (LargePage::IsValid(lop)) {
|
||||
- SetOldSpacePageFlags(lop, true, is_compacting_);
|
||||
- lop = lop->next_page();
|
||||
- }
|
||||
-diff --git a/deps/v8/src/heap/spaces-inl.h b/deps/v8/src/heap/spaces-inl.h
|
||||
-index 56c2bad..1a45096 100644
|
||||
---- a/deps/v8/src/heap/spaces-inl.h
|
||||
-+++ b/deps/v8/src/heap/spaces-inl.h
|
||||
-@@ -148,7 +148,7 @@ Page* Page::Initialize(Heap* heap, MemoryChunk* chunk, Executability executable,
|
||||
-
|
||||
- bool PagedSpace::Contains(Address addr) {
|
||||
- Page* p = Page::FromAddress(addr);
|
||||
-- if (!p->is_valid()) return false;
|
||||
-+ if (!Page::IsValid(p)) return false;
|
||||
- return p->owner() == this;
|
||||
- }
|
||||
-
|
||||
-diff --git a/deps/v8/src/heap/spaces.cc b/deps/v8/src/heap/spaces.cc
|
||||
-index e197f5a..2fe10eb 100644
|
||||
---- a/deps/v8/src/heap/spaces.cc
|
||||
-+++ b/deps/v8/src/heap/spaces.cc
|
||||
-@@ -2918,7 +2918,7 @@ LargePage* LargeObjectSpace::FindPage(Address a) {
|
||||
- if (e != NULL) {
|
||||
- DCHECK(e->value != NULL);
|
||||
- LargePage* page = reinterpret_cast<LargePage*>(e->value);
|
||||
-- DCHECK(page->is_valid());
|
||||
-+ DCHECK(LargePage::IsValid(page));
|
||||
- if (page->Contains(a)) {
|
||||
- return page;
|
||||
- }
|
||||
-diff --git a/deps/v8/src/heap/spaces.h b/deps/v8/src/heap/spaces.h
|
||||
-index 312d75f..1054672 100644
|
||||
---- a/deps/v8/src/heap/spaces.h
|
||||
-+++ b/deps/v8/src/heap/spaces.h
|
||||
-@@ -283,9 +283,9 @@ class MemoryChunk {
|
||||
- // Only works for addresses in pointer spaces, not data or code spaces.
|
||||
- static inline MemoryChunk* FromAnyPointerAddress(Heap* heap, Address addr);
|
||||
-
|
||||
-- Address address() { return reinterpret_cast<Address>(this); }
|
||||
-+ static bool IsValid(MemoryChunk* chunk) { return chunk != nullptr; }
|
||||
-
|
||||
-- bool is_valid() { return address() != NULL; }
|
||||
-+ Address address() { return reinterpret_cast<Address>(this); }
|
||||
-
|
||||
- MemoryChunk* next_chunk() const {
|
||||
- return reinterpret_cast<MemoryChunk*>(base::Acquire_Load(&next_chunk_));
|
@ -0,0 +1,31 @@
|
||||
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 \
|
@ -0,0 +1,97 @@
|
||||
From: Michael Heimpold <mhei@heimpold.de>
|
||||
Date: Sat, 3 Sep 2016 00:00:54 +0200
|
||||
Subject: Treewide fix of typo: PKG_LICENSE_FILE --> PKG_LICENSE_FILES
|
||||
|
||||
Without the trailing _S_ the variable is not considered at all.
|
||||
|
||||
[linus.luessing@c0d3.blue: backport, node* only]
|
||||
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
|
||||
|
||||
diff --git a/lang/node-arduino-firmata/Makefile b/lang/node-arduino-firmata/Makefile
|
||||
index 3273f9760c929eeda47f93229a7aae3b19a5f874..1a46974d44ec87d1b09d9d39396e0705426f59cb 100644
|
||||
--- a/lang/node-arduino-firmata/Makefile
|
||||
+++ b/lang/node-arduino-firmata/Makefile
|
||||
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||
PKG_NPM_NAME:=arduino-firmata
|
||||
PKG_NAME:=node-$(PKG_NPM_NAME)
|
||||
PKG_VERSION:=0.3.3
|
||||
-PKG_RELEASE:=4
|
||||
+PKG_RELEASE:=5
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/shokai/node-arduino-firmata.git
|
||||
@@ -23,7 +23,7 @@ PKG_NODE_VERSION:=4.4.5
|
||||
|
||||
PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
|
||||
PKG_LICENSE:=MIT
|
||||
-PKG_LICENSE_FILE:=LICENSE.txt
|
||||
+PKG_LICENSE_FILES:=LICENSE.txt
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
diff --git a/lang/node-cylon/Makefile b/lang/node-cylon/Makefile
|
||||
index dca44522e4c19fd180e5b5682592567f08a1e4f1..5c673b5785432ef65835d4972ef4eb88ac745b75 100644
|
||||
--- a/lang/node-cylon/Makefile
|
||||
+++ b/lang/node-cylon/Makefile
|
||||
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||
PKG_NPM_NAME:=cylon
|
||||
PKG_NAME:=node-$(PKG_NPM_NAME)
|
||||
PKG_VERSION:=0.22.0
|
||||
-PKG_RELEASE:=4
|
||||
+PKG_RELEASE:=5
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/hybridgroup/cylon-firmata.git
|
||||
@@ -23,7 +23,7 @@ PKG_NODE_VERSION:=4.4.5
|
||||
|
||||
PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
|
||||
PKG_LICENSE:=Apache-2.0
|
||||
-PKG_LICENSE_FILE:=LICENSE
|
||||
+PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
diff --git a/lang/node-hid/Makefile b/lang/node-hid/Makefile
|
||||
index 7431cd5f22880bfea4ca8e10cf4d314f93ac050d..c553b9752a71e23290393940c27bf1443c6736f1 100644
|
||||
--- a/lang/node-hid/Makefile
|
||||
+++ b/lang/node-hid/Makefile
|
||||
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||
PKG_NPM_NAME:=hid
|
||||
PKG_NAME:=node-$(PKG_NPM_NAME)
|
||||
PKG_VERSION:=0.5.1
|
||||
-PKG_RELEASE:=4
|
||||
+PKG_RELEASE:=5
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/node-hid/node-hid.git
|
||||
@@ -23,7 +23,7 @@ PKG_NODE_VERSION:=4.4.5
|
||||
|
||||
PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
|
||||
PKG_LICENSE:=Custom
|
||||
-PKG_LICENSE_FILE:=
|
||||
+PKG_LICENSE_FILES:=
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
diff --git a/lang/node-serialport/Makefile b/lang/node-serialport/Makefile
|
||||
index c45149166b1e43e98be7f2cbb7159017874540d6..8fc676cd384a6d3e5348517a6839e91754d1d6b7 100644
|
||||
--- a/lang/node-serialport/Makefile
|
||||
+++ b/lang/node-serialport/Makefile
|
||||
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||
PKG_NPM_NAME:=serialport
|
||||
PKG_NAME:=node-$(PKG_NPM_NAME)
|
||||
PKG_VERSION:=3.0.0
|
||||
-PKG_RELEASE:=2
|
||||
+PKG_RELEASE:=3
|
||||
|
||||
PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz
|
||||
PKG_SOURCE_URL:=http://registry.npmjs.org/$(PKG_NPM_NAME)/-/
|
||||
@@ -21,7 +21,7 @@ PKG_NODE_VERSION:=4.4.5
|
||||
|
||||
PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
|
||||
PKG_LICENSE:=Custom
|
||||
-PKG_LICENSE_FILE:=LICENSE
|
||||
+PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
Loading…
Reference in New Issue
Block a user