diff mbox series

[05/13] package/nodejs: add host-{c-ares, libuv, nghttp2} to deps

Message ID 20220809075704.86472-6-ardeleanalex@gmail.com
State Changes Requested
Headers show
Series package/nodejs: rework cross-building | expand

Commit Message

Alexandru Ardelean Aug. 9, 2022, 7:56 a.m. UTC
Required for the host-tools when cross-building.
The nodejs target-build requires some host tool support to be able to
properly build.

Unfortunately, when building a 32-bit target on a 64-bit host, uses
will need to install on the host the 32-bit bi-arch libs for
'libicu libc-ares libuv1 libnghttp2 zlib1g', but that seems that is also
the case (already) for some other packages that select symbols
BR2_HOSTARCH_NEEDS_IA32_LIBS & BR2_HOSTARCH_NEEDS_IA32_COMPILER.

So, we'll need to do the same later.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
---
 package/nodejs/Config.in      | 3 +++
 package/nodejs/Config.in.host | 3 +++
 package/nodejs/nodejs.mk      | 6 ++++++
 3 files changed, 12 insertions(+)
diff mbox series

Patch

diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in
index 016aeb4e1a..fad211b750 100644
--- a/package/nodejs/Config.in
+++ b/package/nodejs/Config.in
@@ -28,6 +28,9 @@  config BR2_PACKAGE_NODEJS
 	# linking, but that's too much of a corner case to support it.
 	depends on !BR2_STATIC_LIBS
 	select BR2_PACKAGE_HOST_NODEJS
+	select BR2_PACKAGE_HOST_C_ARES
+	select BR2_PACKAGE_HOST_LIBUV
+	select BR2_PACKAGE_HOST_NGHTTP2
 	select BR2_PACKAGE_C_ARES
 	select BR2_PACKAGE_LIBUV
 	select BR2_PACKAGE_ZLIB
diff --git a/package/nodejs/Config.in.host b/package/nodejs/Config.in.host
index d023ffc36d..328c8872d3 100644
--- a/package/nodejs/Config.in.host
+++ b/package/nodejs/Config.in.host
@@ -2,6 +2,9 @@  config BR2_PACKAGE_HOST_NODEJS
 	bool "host nodejs"
 	depends on BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS
 	depends on BR2_HOST_GCC_AT_LEAST_8
+	select BR2_PACKAGE_HOST_C_ARES
+	select BR2_PACKAGE_HOST_LIBUV
+	select BR2_PACKAGE_HOST_NGHTTPS2
 	select BR2_PACKAGE_HOST_PYTHON3
 	select BR2_PACKAGE_HOST_PYTHON3_BZIP2
 	select BR2_PACKAGE_HOST_PYTHON3_SSL
diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index a8229eb4b1..d15c027c70 100644
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -9,6 +9,9 @@  NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz
 NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION)
 NODEJS_DEPENDENCIES = \
 	host-nodejs \
+	host-c-ares \
+	host-libuv \
+	host-nghttp2 \
 	host-ninja \
 	host-pkgconf \
 	host-python3 \
@@ -18,6 +21,9 @@  NODEJS_DEPENDENCIES = \
 	zlib \
 	$(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS))
 HOST_NODEJS_DEPENDENCIES = \
+	host-c-ares \
+	host-libuv \
+	host-nghttp2 \
 	host-icu \
 	host-libopenssl \
 	host-ninja \