Skip to contentSkip to conversation

package/nodejs: install to staging

PATCH New yegorslists at googlemail.com 3 participants 3 messages Jun 8, 2020 – Jul 12, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/nodejs: install to staging

From: Yegor Yefremov <[email protected]>

Install header files and libraries into the staging area. Some packages like mraa (if enabled for Node.js) search for node.h and v8.h. Hence, Node.js development file must be installed to the staging area.

---
 package/nodejs/nodejs.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)
package/nodejs/nodejs.mk +12 -0
index 37d7877226..3f35ac7c33 100644
@@ -11,6 +11,7 @@ NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \
 	libuv zlib nghttp2 \
 	$(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS))
 HOST_NODEJS_DEPENDENCIES = host-libopenssl host-python host-zlib
+NODEJS_INSTALL_STAGING = YES
 NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components)
 NODEJS_LICENSE_FILES = LICENSE
 
@@ -215,6 +216,17 @@ define NODEJS_INSTALL_MODULES
 endef
 endif
 
+define NODEJS_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \
+		$(MAKE) -C $(@D) install \
+		DESTDIR=$(STAGING_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		NO_LOAD=cctest.target.mk \
+		PATH=$(@D)/bin:$(BR_PATH) \
+		LDFLAGS="$(NODEJS_LDFLAGS)" \
+		LD="$(TARGET_CXX)"
+endef
+
 define NODEJS_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \
 		$(MAKE) -C $(@D) install \
Signature · 1 line
2.17.0
#1 lore raw

PATCH 1/1 package/nodejs: install to staging

Quoted 11 lines · On Mon, 8 Jun 2020 12:32:10 +0200 yegorslists at googlemail.com wrote:

From: Yegor Yefremov <[email protected]>

Install header files and libraries into the staging area. Some packages like mraa (if enabled for Node.js) search for node.h and v8.h. Hence, Node.js development file must be installed to the staging area.

---
 package/nodejs/nodejs.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)

Applied to master, thanks.

Thomas

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

PATCH 1/1 package/nodejs: install to staging

In reply to yegorslists at googlemail.com
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"yegorslists" == yegorslists <[email protected]> writes:

From: Yegor Yefremov <[email protected]> Install header files and libraries into the staging area. Some packages like mraa (if enabled for Node.js) search for node.h and v8.h. Hence, Node.js development file must be installed to the staging area.

Committed to 2020.02.x and 2020.05.x, thanks.

Quoted 41 lines
---
 package/nodejs/nodejs.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)
package/nodejs/nodejs.mk +12 -0
index 37d7877226..3f35ac7c33 100644
@@ -11,6 +11,7 @@ NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \
 	libuv zlib nghttp2 \
 	$(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS))
 HOST_NODEJS_DEPENDENCIES = host-libopenssl host-python host-zlib
+NODEJS_INSTALL_STAGING = YES
 NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components)
 NODEJS_LICENSE_FILES = LICENSE
 
@@ -215,6 +216,17 @@ define NODEJS_INSTALL_MODULES
 endef
 endif
 
+define NODEJS_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \
+		$(MAKE) -C $(@D) install \
+		DESTDIR=$(STAGING_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		NO_LOAD=cctest.target.mk \
+		PATH=$(@D)/bin:$(BR_PATH) \
+		LDFLAGS="$(NODEJS_LDFLAGS)" \
+		LD="$(TARGET_CXX)"
+endef
+
 define NODEJS_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \
 		$(MAKE) -C $(@D) install \
Signature · 6 lines
2.17.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 1 line
Bye, Peter Korsgaard