NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/nodejs: rename to nodejs-src and convert to virtual package

Browse Source 
host-nodejs is quite long to build (5 minutes on a very fast build
machine), and will become a download dependency when we implement
vendoring for NodeJS-based packages.

In order to mitigate this build time, an idea is to use a pre-compiled
host NodeJS. One option would be to use a pre-installed NodeJS, but
we're concerned by version compatibility issues of the host NodeJS/NPM
does not have the same version as the target NodeJS/NPM. So another
option is to use a pre-compiled NodeJS provided by the NodeJS project
itself.

To achieve this, this commit turns the host-nodejs package into a
virtual package. For the time being, this has just one provider:
host-nodejs-src, which builds host-nodejs from source. This is the
original host-nodejs package, renamed to host-nodejs-src.

The target nodejs package is also renamed to nodejs-src in order to have
a single package nodejs-src that has a host and target version, as
usual. We do keep the nodejs target package itself, but it's an empty
package - not even a virtual package. This means the following.
- Its VERSION, SOURCE and SITE variables are left empty. The existing
  variables are renamed to NODEJS_COMMON_VERSION etc. to allow them to
  be reused by nodejs-src and the future nodejs-bin.
- It's a generic package with a single dependency, nodejs-src.
- The Config.in remains unchanged, except that it selects
  BR2_PACKAGE_NODEJS_SRC.
- BR2_PACKAGE_NODEJS_SRC is a blind option.

Co-authored-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Arnout Vandecappelle 2023-10-01 22:59:19 +02:00
parent 4c66ee3cda
commit 4cbc2af604
11 changed files with 99 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/nodejs/Config.in
View File

@ -26,6 +26,7 @@ config BR2_PACKAGE_NODEJS
# uses dlopen(). On ARMv5, we could technically support static # uses dlopen(). On ARMv5, we could technically support static
# linking, but that's too much of a corner case to support it. # linking, but that's too much of a corner case to support it.
depends on !BR2_STATIC_LIBS depends on !BR2_STATIC_LIBS
select BR2_PACKAGE_NODEJS_SRC
select BR2_PACKAGE_HOST_NODEJS if BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL != "" select BR2_PACKAGE_HOST_NODEJS if BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL != ""
select BR2_PACKAGE_HOST_PYTHON3 select BR2_PACKAGE_HOST_PYTHON3
select BR2_PACKAGE_HOST_PYTHON3_BZIP2 select BR2_PACKAGE_HOST_PYTHON3_BZIP2
@ -85,3 +86,5 @@ config BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS
modules. modules.
endif endif
source "package/nodejs/nodejs-src/Config.in"

4
package/nodejs/Config.in.host
View File

@ -28,4 +28,8 @@ config BR2_PACKAGE_HOST_NODEJS_COREPACK
what currently happens with npm, which is shipped by Node.js what currently happens with npm, which is shipped by Node.js
by default. by default.
config BR2_PACKAGE_PROVIDES_HOST_NODEJS
string
default "host-nodejs-src"
endif endif

0
package/nodejs/nodejs/0001-add-qemu-wrapper-support.patch → package/nodejs/nodejs-src/0001-add-qemu-wrapper-support.patch
View File

0
package/nodejs/nodejs/0002-check-if-uclibc-has-backtrace-support.patch → package/nodejs/nodejs-src/0002-check-if-uclibc-has-backtrace-support.patch
View File

0
package/nodejs/nodejs/0003-include-obj-name-in-shared-intermediate.patch → package/nodejs/nodejs-src/0003-include-obj-name-in-shared-intermediate.patch
View File

0
package/nodejs/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch → package/nodejs/nodejs-src/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch
View File

2
package/nodejs/nodejs-src/Config.in Normal file
View File

@ -0,0 +1,2 @@
config BR2_PACKAGE_NODEJS_SRC
bool

0
package/nodejs/nodejs/nodejs.hash → package/nodejs/nodejs-src/nodejs-src.hash
View File

154
package/nodejs/nodejs/nodejs.mk → package/nodejs/nodejs-src/nodejs-src.mk
View File

@ -1,12 +1,22 @@
################################################################################ ################################################################################
# #
# nodejs # nodejs-src
# #
################################################################################ ################################################################################
# version etc. already defined in package/nodejs/nodejs.mk NODEJS_SRC_VERSION = $(NODEJS_COMMON_VERSION)
NODEJS_SRC_SOURCE = $(NODEJS_COMMON_SOURCE)
NODEJS_SRC_SITE = $(NODEJS_COMMON_SITE)
NODEJS_SRC_DL_SUBDIR = nodejs
NODEJS_DEPENDENCIES = \ NODEJS_SRC_LICENSE = $(NODEJS_LICENSE)
NODEJS_SRC_LICENSE_FILES = $(NODEJS_LICENSE_FILES)
NODEJS_SRC_CPE_ID_VENDOR = $(NODEJS_CPE_ID_VENDOR)
NODEJS_SRC_CPE_ID_PRODUCT = $(NODEJS_CPE_ID_PRODUCT)
HOST_NODEJS_SRC_PROVIDES = host-nodejs
NODEJS_SRC_DEPENDENCIES = \
host-ninja \ host-ninja \
host-pkgconf \ host-pkgconf \
host-python3 \ host-python3 \
@ -16,16 +26,16 @@ NODEJS_DEPENDENCIES = \
nghttp2 \ nghttp2 \
zlib \ zlib \
$(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS)) $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS))
HOST_NODEJS_DEPENDENCIES = \ HOST_NODEJS_SRC_DEPENDENCIES = \
host-icu \ host-icu \
host-libopenssl \ host-libopenssl \
host-ninja \ host-ninja \
host-pkgconf \ host-pkgconf \
host-python3 \ host-python3 \
host-zlib host-zlib
NODEJS_INSTALL_STAGING = YES NODEJS_SRC_INSTALL_STAGING = YES
NODEJS_CONF_OPTS = \ NODEJS_SRC_CONF_OPTS = \
--shared-zlib \ --shared-zlib \
--shared-cares \ --shared-cares \
--shared-libuv \ --shared-libuv \
@ -36,51 +46,51 @@ NODEJS_CONF_OPTS = \
--dest-os=linux \ --dest-os=linux \
--ninja --ninja
HOST_NODEJS_MAKE_OPTS = \ HOST_NODEJS_SRC_MAKE_OPTS = \
$(HOST_CONFIGURE_OPTS) \ $(HOST_CONFIGURE_OPTS) \
CXXFLAGS="$(HOST_NODEJS_CXXFLAGS)" \ CXXFLAGS="$(HOST_NODEJS_SRC_CXXFLAGS)" \
LDFLAGS.host="$(HOST_LDFLAGS)" \ LDFLAGS.host="$(HOST_LDFLAGS)" \
NO_LOAD=cctest.target.mk \ NO_LOAD=cctest.target.mk \
PATH=$(@D)/bin:$(BR_PATH) \ PATH=$(@D)/bin:$(BR_PATH) \
JOBS=$(PARALLEL_JOBS) JOBS=$(PARALLEL_JOBS)
NODEJS_MAKE_OPTS = \ NODEJS_SRC_MAKE_OPTS = \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
NO_LOAD=cctest.target.mk \ NO_LOAD=cctest.target.mk \
PATH=$(@D)/bin:$(BR_PATH) \ PATH=$(@D)/bin:$(BR_PATH) \
LDFLAGS="$(NODEJS_LDFLAGS)" \ LDFLAGS="$(NODEJS_SRC_LDFLAGS)" \
LD="$(TARGET_CXX)" \ LD="$(TARGET_CXX)" \
JOBS=$(PARALLEL_JOBS) JOBS=$(PARALLEL_JOBS)
# nodejs's build system uses python which can be a symlink to an unsupported # nodejs's build system uses python which can be a symlink to an unsupported
# python version (e.g. python 3.10 with nodejs 14.18.1). We work around this by # python version (e.g. python 3.10 with nodejs 14.18.1). We work around this by
# forcing host-python3 early in the PATH, via a python->python3 symlink. # forcing host-python3 early in the PATH, via a python->python3 symlink.
define NODEJS_PYTHON3_SYMLINK define NODEJS_SRC_PYTHON3_SYMLINK
mkdir -p $(@D)/bin mkdir -p $(@D)/bin
ln -sf $(HOST_DIR)/bin/python3 $(@D)/bin/python ln -sf $(HOST_DIR)/bin/python3 $(@D)/bin/python
endef endef
HOST_NODEJS_PRE_CONFIGURE_HOOKS += NODEJS_PYTHON3_SYMLINK HOST_NODEJS_SRC_PRE_CONFIGURE_HOOKS += NODEJS_SRC_PYTHON3_SYMLINK
NODEJS_PRE_CONFIGURE_HOOKS += NODEJS_PYTHON3_SYMLINK NODEJS_SRC_PRE_CONFIGURE_HOOKS += NODEJS_SRC_PYTHON3_SYMLINK
ifeq ($(BR2_PACKAGE_OPENSSL),y) ifeq ($(BR2_PACKAGE_OPENSSL),y)
NODEJS_DEPENDENCIES += openssl NODEJS_SRC_DEPENDENCIES += openssl
NODEJS_CONF_OPTS += --shared-openssl NODEJS_SRC_CONF_OPTS += --shared-openssl
else else
NODEJS_CONF_OPTS += --without-ssl NODEJS_SRC_CONF_OPTS += --without-ssl
endif endif
ifeq ($(BR2_PACKAGE_ICU),y) ifeq ($(BR2_PACKAGE_ICU),y)
NODEJS_DEPENDENCIES += icu NODEJS_SRC_DEPENDENCIES += icu
NODEJS_CONF_OPTS += --with-intl=system-icu NODEJS_SRC_CONF_OPTS += --with-intl=system-icu
else else
NODEJS_CONF_OPTS += --with-intl=none NODEJS_SRC_CONF_OPTS += --with-intl=none
endif endif
ifneq ($(BR2_PACKAGE_NODEJS_NPM),y) ifneq ($(BR2_PACKAGE_NODEJS_NPM),y)
NODEJS_CONF_OPTS += --without-npm NODEJS_SRC_CONF_OPTS += --without-npm
endif endif
define HOST_NODEJS_CONFIGURE_CMDS define HOST_NODEJS_SRC_CONFIGURE_CMDS
cd $(@D); \ cd $(@D); \
$(HOST_CONFIGURE_OPTS) \ $(HOST_CONFIGURE_OPTS) \
PATH=$(@D)/bin:$(BR_PATH) \ PATH=$(@D)/bin:$(BR_PATH) \
@ -98,72 +108,72 @@ define HOST_NODEJS_CONFIGURE_CMDS
--ninja --ninja
endef endef
HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) HOST_NODEJS_SRC_CXXFLAGS = $(HOST_CXXFLAGS)
define HOST_NODEJS_BUILD_CMDS define HOST_NODEJS_SRC_BUILD_CMDS
$(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \
$(MAKE) -C $(@D) \ $(MAKE) -C $(@D) \
$(HOST_NODEJS_MAKE_OPTS) $(HOST_NODEJS_SRC_MAKE_OPTS)
endef endef
ifeq ($(BR2_PACKAGE_HOST_NODEJS_COREPACK),y) ifeq ($(BR2_PACKAGE_HOST_NODEJS_COREPACK),y)
define HOST_NODEJS_ENABLE_COREPACK define HOST_NODEJS_SRC_ENABLE_COREPACK
$(COREPACK) enable $(COREPACK) enable
endef endef
endif endif
define HOST_NODEJS_INSTALL_CMDS define HOST_NODEJS_SRC_INSTALL_CMDS
$(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \
$(MAKE) -C $(@D) install \ $(MAKE) -C $(@D) install \
$(HOST_NODEJS_MAKE_OPTS) $(HOST_NODEJS_SRC_MAKE_OPTS)
$(HOST_NODEJS_ENABLE_COREPACK) $(HOST_NODEJS_SRC_ENABLE_COREPACK)
endef endef
ifeq ($(BR2_i386),y) ifeq ($(BR2_i386),y)
NODEJS_CPU = ia32 NODEJS_SRC_CPU = ia32
else ifeq ($(BR2_x86_64),y) else ifeq ($(BR2_x86_64),y)
NODEJS_CPU = x64 NODEJS_SRC_CPU = x64
else ifeq ($(BR2_mips),y) else ifeq ($(BR2_mips),y)
NODEJS_CPU = mips NODEJS_SRC_CPU = mips
else ifeq ($(BR2_mipsel),y) else ifeq ($(BR2_mipsel),y)
NODEJS_CPU = mipsel NODEJS_SRC_CPU = mipsel
else ifeq ($(BR2_arm),y) else ifeq ($(BR2_arm),y)
NODEJS_CPU = arm NODEJS_SRC_CPU = arm
# V8 needs to know what floating point ABI the target is using. # V8 needs to know what floating point ABI the target is using.
NODEJS_ARM_FP = $(GCC_TARGET_FLOAT_ABI) NODEJS_SRC_ARM_FP = $(GCC_TARGET_FLOAT_ABI)
# it also wants to know which FPU to use, but only has support for # it also wants to know which FPU to use, but only has support for
# vfp, vfpv3, vfpv3-d16 and neon. # vfp, vfpv3, vfpv3-d16 and neon.
ifeq ($(BR2_ARM_FPU_VFPV2),y) ifeq ($(BR2_ARM_FPU_VFPV2),y)
NODEJS_ARM_FPU = vfp NODEJS_SRC_ARM_FPU = vfp
# vfpv4 is a superset of vfpv3 # vfpv4 is a superset of vfpv3
else ifeq ($(BR2_ARM_FPU_VFPV3)$(BR2_ARM_FPU_VFPV4),y) else ifeq ($(BR2_ARM_FPU_VFPV3)$(BR2_ARM_FPU_VFPV4),y)
NODEJS_ARM_FPU = vfpv3 NODEJS_SRC_ARM_FPU = vfpv3
# vfpv4-d16 is a superset of vfpv3-d16 # vfpv4-d16 is a superset of vfpv3-d16
else ifeq ($(BR2_ARM_FPU_VFPV3D16)$(BR2_ARM_FPU_VFPV4D16),y) else ifeq ($(BR2_ARM_FPU_VFPV3D16)$(BR2_ARM_FPU_VFPV4D16),y)
NODEJS_ARM_FPU = vfpv3-d16 NODEJS_SRC_ARM_FPU = vfpv3-d16
else ifeq ($(BR2_ARM_FPU_NEON),y) else ifeq ($(BR2_ARM_FPU_NEON),y)
NODEJS_ARM_FPU = neon NODEJS_SRC_ARM_FPU = neon
endif endif
else ifeq ($(BR2_aarch64),y) else ifeq ($(BR2_aarch64),y)
NODEJS_CPU = arm64 NODEJS_SRC_CPU = arm64
endif endif
# MIPS architecture specific options # MIPS architecture specific options
ifeq ($(BR2_mips)$(BR2_mipsel),y) ifeq ($(BR2_mips)$(BR2_mipsel),y)
ifeq ($(BR2_MIPS_CPU_MIPS32R6),y) ifeq ($(BR2_MIPS_CPU_MIPS32R6),y)
NODEJS_MIPS_ARCH_VARIANT = r6 NODEJS_SRC_MIPS_ARCH_VARIANT = r6
NODEJS_MIPS_FPU_MODE = fp64 NODEJS_SRC_MIPS_FPU_MODE = fp64
else ifeq ($(BR2_MIPS_CPU_MIPS32R2),y) else ifeq ($(BR2_MIPS_CPU_MIPS32R2),y)
NODEJS_MIPS_ARCH_VARIANT = r2 NODEJS_SRC_MIPS_ARCH_VARIANT = r2
else ifeq ($(BR2_MIPS_CPU_MIPS32),y) else ifeq ($(BR2_MIPS_CPU_MIPS32),y)
NODEJS_MIPS_ARCH_VARIANT = r1 NODEJS_SRC_MIPS_ARCH_VARIANT = r1
endif endif
endif endif
NODEJS_LDFLAGS = $(TARGET_LDFLAGS) NODEJS_SRC_LDFLAGS = $(TARGET_LDFLAGS)
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
NODEJS_LDFLAGS += -latomic NODEJS_SRC_LDFLAGS += -latomic
endif endif
# V8's JIT infrastructure requires binaries such as mksnapshot and # V8's JIT infrastructure requires binaries such as mksnapshot and
@ -172,8 +182,8 @@ endif
# host targeting ARMv6 needs to produce a 32-bit binary). To work around this # host targeting ARMv6 needs to produce a 32-bit binary). To work around this
# issue, cross-compile the binaries for the target and run them on the # issue, cross-compile the binaries for the target and run them on the
# host with QEMU, much like gobject-introspection. # host with QEMU, much like gobject-introspection.
define NODEJS_INSTALL_V8_QEMU_WRAPPER define NODEJS_SRC_INSTALL_V8_QEMU_WRAPPER
$(INSTALL) -D -m 755 $(NODEJS_PKGDIR)/v8-qemu-wrapper.in \ $(INSTALL) -D -m 755 $(NODEJS_SRC_PKGDIR)/v8-qemu-wrapper.in \
$(@D)/out/Release/v8-qemu-wrapper $(@D)/out/Release/v8-qemu-wrapper
$(SED) "s%@QEMU_USER@%$(QEMU_USER)%g" \ $(SED) "s%@QEMU_USER@%$(QEMU_USER)%g" \
$(@D)/out/Release/v8-qemu-wrapper $(@D)/out/Release/v8-qemu-wrapper
@ -182,77 +192,77 @@ define NODEJS_INSTALL_V8_QEMU_WRAPPER
$(SED) "s%@QEMU_USERMODE_ARGS@%$(call qstrip,$(BR2_PACKAGE_HOST_QEMU_USER_MODE_ARGS))%g" \ $(SED) "s%@QEMU_USERMODE_ARGS@%$(call qstrip,$(BR2_PACKAGE_HOST_QEMU_USER_MODE_ARGS))%g" \
$(@D)/out/Release/v8-qemu-wrapper $(@D)/out/Release/v8-qemu-wrapper
endef endef
NODEJS_PRE_CONFIGURE_HOOKS += NODEJS_INSTALL_V8_QEMU_WRAPPER NODEJS_SRC_PRE_CONFIGURE_HOOKS += NODEJS_SRC_INSTALL_V8_QEMU_WRAPPER
define NODEJS_WRAPPER_FIXUP define NODEJS_SRC_WRAPPER_FIXUP
$(SED) "s%@MAYBE_WRAPPER@%'<(PRODUCT_DIR)/v8-qemu-wrapper',%g" $(@D)/node.gyp $(SED) "s%@MAYBE_WRAPPER@%'<(PRODUCT_DIR)/v8-qemu-wrapper',%g" $(@D)/node.gyp
$(SED) "s%@MAYBE_WRAPPER@%'<(PRODUCT_DIR)/v8-qemu-wrapper',%g" $(@D)/tools/v8_gypfiles/v8.gyp $(SED) "s%@MAYBE_WRAPPER@%'<(PRODUCT_DIR)/v8-qemu-wrapper',%g" $(@D)/tools/v8_gypfiles/v8.gyp
endef endef
NODEJS_PRE_CONFIGURE_HOOKS += NODEJS_WRAPPER_FIXUP NODEJS_SRC_PRE_CONFIGURE_HOOKS += NODEJS_SRC_WRAPPER_FIXUP
# Do not run the qemu-wrapper for the host build. # Do not run the qemu-wrapper for the host build.
define HOST_NODEJS_WRAPPER_FIXUP define HOST_NODEJS_SRC_WRAPPER_FIXUP
$(SED) "s%@MAYBE_WRAPPER@%%g" $(@D)/node.gyp $(SED) "s%@MAYBE_WRAPPER@%%g" $(@D)/node.gyp
$(SED) "s%@MAYBE_WRAPPER@%%g" $(@D)/tools/v8_gypfiles/v8.gyp $(SED) "s%@MAYBE_WRAPPER@%%g" $(@D)/tools/v8_gypfiles/v8.gyp
endef endef
HOST_NODEJS_PRE_CONFIGURE_HOOKS += HOST_NODEJS_WRAPPER_FIXUP HOST_NODEJS_SRC_PRE_CONFIGURE_HOOKS += HOST_NODEJS_SRC_WRAPPER_FIXUP
define NODEJS_CONFIGURE_CMDS define NODEJS_SRC_CONFIGURE_CMDS
(cd $(@D); \ (cd $(@D); \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
PATH=$(@D)/bin:$(BR_PATH) \ PATH=$(@D)/bin:$(BR_PATH) \
LDFLAGS="$(NODEJS_LDFLAGS)" \ LDFLAGS="$(NODEJS_SRC_LDFLAGS)" \
LD="$(TARGET_CXX)" \ LD="$(TARGET_CXX)" \
PYTHON=$(HOST_DIR)/bin/python3 \ PYTHON=$(HOST_DIR)/bin/python3 \
$(HOST_DIR)/bin/python3 configure.py \ $(HOST_DIR)/bin/python3 configure.py \
--prefix=/usr \ --prefix=/usr \
--dest-cpu=$(NODEJS_CPU) \ --dest-cpu=$(NODEJS_SRC_CPU) \
$(if $(NODEJS_ARM_FP),--with-arm-float-abi=$(NODEJS_ARM_FP)) \ $(if $(NODEJS_SRC_ARM_FP),--with-arm-float-abi=$(NODEJS_SRC_ARM_FP)) \
$(if $(NODEJS_ARM_FPU),--with-arm-fpu=$(NODEJS_ARM_FPU)) \ $(if $(NODEJS_SRC_ARM_FPU),--with-arm-fpu=$(NODEJS_SRC_ARM_FPU)) \
$(if $(NODEJS_MIPS_ARCH_VARIANT),--with-mips-arch-variant=$(NODEJS_MIPS_ARCH_VARIANT)) \ $(if $(NODEJS_SRC_MIPS_ARCH_VARIANT),--with-mips-arch-variant=$(NODEJS_SRC_MIPS_ARCH_VARIANT)) \
$(if $(NODEJS_MIPS_FPU_MODE),--with-mips-fpu-mode=$(NODEJS_MIPS_FPU_MODE)) \ $(if $(NODEJS_SRC_MIPS_FPU_MODE),--with-mips-fpu-mode=$(NODEJS_SRC_MIPS_FPU_MODE)) \
$(NODEJS_CONF_OPTS) \ $(NODEJS_SRC_CONF_OPTS) \
) )
endef endef
define NODEJS_BUILD_CMDS define NODEJS_SRC_BUILD_CMDS
$(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \
$(MAKE) -C $(@D) \ $(MAKE) -C $(@D) \
$(NODEJS_MAKE_OPTS) $(NODEJS_SRC_MAKE_OPTS)
endef endef
# #
# Build the list of modules to install. # Build the list of modules to install.
# #
NODEJS_MODULES_LIST= $(call qstrip,\ NODEJS_SRC_MODULES_LIST= $(call qstrip,\
$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL)) $(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL))
# #
# We can only call NPM if there's something to install. # We can only call NPM if there's something to install.
# #
ifneq ($(NODEJS_MODULES_LIST),) ifneq ($(NODEJS_SRC_MODULES_LIST),)
NODEJS_DEPENDENCIES += host-nodejs NODEJS_SRC_DEPENDENCIES += host-nodejs
define NODEJS_INSTALL_MODULES define NODEJS_SRC_INSTALL_MODULES
# If you're having trouble with module installation, adding -d to the # If you're having trouble with module installation, adding -d to the
# npm install call below and setting npm_config_rollback=false can both # npm install call below and setting npm_config_rollback=false can both
# help in diagnosing the problem. # help in diagnosing the problem.
$(NPM) install -g $(NODEJS_MODULES_LIST) $(NPM) install -g $(NODEJS_SRC_MODULES_LIST)
endef endef
endif endif
define NODEJS_INSTALL_STAGING_CMDS define NODEJS_SRC_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \
$(MAKE) -C $(@D) install \ $(MAKE) -C $(@D) install \
DESTDIR=$(STAGING_DIR) \ DESTDIR=$(STAGING_DIR) \
$(NODEJS_MAKE_OPTS) $(NODEJS_SRC_MAKE_OPTS)
endef endef
define NODEJS_INSTALL_TARGET_CMDS define NODEJS_SRC_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \
$(MAKE) -C $(@D) install \ $(MAKE) -C $(@D) install \
DESTDIR=$(TARGET_DIR) \ DESTDIR=$(TARGET_DIR) \
$(NODEJS_MAKE_OPTS) $(NODEJS_SRC_MAKE_OPTS)
$(NODEJS_INSTALL_MODULES) $(NODEJS_SRC_INSTALL_MODULES)
endef endef
# node.js configure is a Python script and does not use autotools # node.js configure is a Python script and does not use autotools

0
package/nodejs/nodejs/v8-qemu-wrapper.in → package/nodejs/nodejs-src/v8-qemu-wrapper.in
View File

11
package/nodejs/nodejs.mk
View File

@ -4,9 +4,10 @@
# #
################################################################################ ################################################################################
NODEJS_VERSION = 16.20.0 # _VERSION, _SOURCE and _SITE must be kept empty to avoid downloading anything
NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_COMMON_VERSION = 16.20.0
NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_COMMON_SOURCE = node-v$(NODEJS_COMMON_VERSION).tar.xz
NODEJS_COMMON_SITE = http://nodejs.org/dist/v$(NODEJS_COMMON_VERSION)
NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components) NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components)
NODEJS_LICENSE_FILES = LICENSE NODEJS_LICENSE_FILES = LICENSE
@ -31,4 +32,8 @@ PNPM = $(NODEJS_BIN_ENV) $(HOST_DIR)/bin/pnpm
YARN = $(NODEJS_BIN_ENV) $(HOST_DIR)/bin/yarn YARN = $(NODEJS_BIN_ENV) $(HOST_DIR)/bin/yarn
endif endif
NODEJS_DEPENDENCIES = nodejs-src
$(eval $(generic-package))
$(eval $(host-virtual-package))
include $(sort $(wildcard package/nodejs/*/*.mk)) include $(sort $(wildcard package/nodejs/*/*.mk))