Skip to contentSkip to conversation

package/nodejs: correct license file hash

PATCH New Martin Bark 2 participants 3 messages Mar 17, 2019 – Mar 18, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/nodejs: correct license file hash

The LICENSE file in nodejs 10.15.3 updated to include additional 3rd party licenses.

Fixes:
- http://autobuild.buildroot.net/results/4bf66b9f05e9d04171156e44c7dd87619e429747
- http://autobuild.buildroot.net/results/a65776ba1045f12263a686933eb6a4b5d6ff7333
- http://autobuild.buildroot.net/results/aab619106a7d763f45e95a7ae3d85816fb4a6512
- http://autobuild.buildroot.net/results/bb6cb93f323be22e4c0efc05011042526c01f62c

---
 package/nodejs/nodejs.hash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/nodejs/nodejs.hash +1 -1
index e9c174e662..6cb2cdd5b7 100644
@@ -2,4 +2,4 @@
 sha256 4e22d926f054150002055474e452ed6cbb85860aa7dc5422213a2002ed9791d5  node-v10.15.3.tar.xz
 
 # Hash for license file
-sha256 b87be6c1479ed977481115869c2dd8b6d59e5ea55aa09939d6c898242121b2f5  LICENSE
+sha256 7ab373b3671d57d91078f5345ea9486443c9ca498eb9f8cf87dee2641a6fa09d  LICENSE
Signature · 1 line
2.21.0
#1 lore raw

PATCH 2/2 package/nodejs: link with libatomic when needed

Fixes:
- http://autobuild.buildroot.net/results/804951467d3f5b212bd33b95dc8fe9c6f5f63838

---
 package/nodejs/nodejs.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)
package/nodejs/nodejs.mk +10 -0
index 5cae449244..2577239e19 100644
@@ -116,6 +116,12 @@ NODEJS_MIPS_ARCH_VARIANT = r1
 endif
 endif
 
+NODEJS_LDFLAGS = $(TARGET_LDFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+NODEJS_LDFLAGS += -latomic
+endif
+
 define NODEJS_CONFIGURE_CMDS
 	mkdir -p $(@D)/bin
 	ln -sf $(HOST_DIR)/bin/python2 $(@D)/bin/python
@@ -123,6 +129,7 @@ define NODEJS_CONFIGURE_CMDS
 	(cd $(@D); \
 		$(TARGET_CONFIGURE_OPTS) \
 		PATH=$(@D)/bin:$(BR_PATH) \
+		LDFLAGS="$(NODEJS_LDFLAGS)" \
 		LD="$(TARGET_CXX)" \
 		PYTHON=$(HOST_DIR)/bin/python2 \
 		$(HOST_DIR)/bin/python2 ./configure \
@@ -145,6 +152,7 @@ define NODEJS_BUILD_CMDS
 		$(TARGET_CONFIGURE_OPTS) \
 		NO_LOAD=cctest.target.mk \
 		PATH=$(@D)/bin:$(BR_PATH) \
+		LDFLAGS="$(NODEJS_LDFLAGS)" \
 		LD="$(TARGET_CXX)"
 endef
 
@@ -156,6 +164,7 @@ NODEJS_MODULES_LIST= $(call qstrip,\
 
 # Define NPM for other packages to use
 NPM = $(TARGET_CONFIGURE_OPTS) \
+	LDFLAGS="$(NODEJS_LDFLAGS)" \
 	LD="$(TARGET_CXX)" \
 	npm_config_arch=$(NODEJS_CPU) \
 	npm_config_target_arch=$(NODEJS_CPU) \
@@ -184,6 +193,7 @@ define NODEJS_INSTALL_TARGET_CMDS
 		$(TARGET_CONFIGURE_OPTS) \
 		NO_LOAD=cctest.target.mk \
 		PATH=$(@D)/bin:$(BR_PATH) \
+		LDFLAGS="$(NODEJS_LDFLAGS)" \
 		LD="$(TARGET_CXX)"
 	$(NODEJS_INSTALL_MODULES)
 endef
Signature · 1 line
2.21.0
#2 lore raw

PATCH 1/2 package/nodejs: correct license file hash

In reply to Martin Bark
Quoted 9 lines · On Sun, 17 Mar 2019 20:47:59 +0000 Martin Bark <[email protected]> wrote:

The LICENSE file in nodejs 10.15.3 updated to include additional 3rd party licenses.

Fixes:
- http://autobuild.buildroot.net/results/4bf66b9f05e9d04171156e44c7dd87619e429747
- http://autobuild.buildroot.net/results/a65776ba1045f12263a686933eb6a4b5d6ff7333
- http://autobuild.buildroot.net/results/aab619106a7d763f45e95a7ae3d85816fb4a6512
- http://autobuild.buildroot.net/results/bb6cb93f323be22e4c0efc05011042526c01f62c

Quoted 4 lines
---
 package/nodejs/nodejs.hash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Both applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com