|
@@ -109,10 +109,17 @@ define HOST_NODEJS_BUILD_CMDS
|
|
$(HOST_NODEJS_MAKE_OPTS)
|
|
$(HOST_NODEJS_MAKE_OPTS)
|
|
endef
|
|
endef
|
|
|
|
|
|
|
|
+ifeq ($(BR2_PACKAGE_HOST_NODEJS_COREPACK),y)
|
|
|
|
+define HOST_NODEJS_ENABLE_COREPACK
|
|
|
|
+ $(COREPACK) enable
|
|
|
|
+endef
|
|
|
|
+endif
|
|
|
|
+
|
|
define HOST_NODEJS_INSTALL_CMDS
|
|
define HOST_NODEJS_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_MAKE_OPTS)
|
|
|
|
+ $(HOST_NODEJS_ENABLE_COREPACK)
|
|
endef
|
|
endef
|
|
|
|
|
|
ifeq ($(BR2_i386),y)
|
|
ifeq ($(BR2_i386),y)
|
|
@@ -223,8 +230,7 @@ endef
|
|
NODEJS_MODULES_LIST= $(call qstrip,\
|
|
NODEJS_MODULES_LIST= $(call qstrip,\
|
|
$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL))
|
|
$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL))
|
|
|
|
|
|
-# Define NPM for other packages to use
|
|
|
|
-NPM = $(TARGET_CONFIGURE_OPTS) \
|
|
|
|
|
|
+NODEJS_BIN_ENV = $(TARGET_CONFIGURE_OPTS) \
|
|
LDFLAGS="$(NODEJS_LDFLAGS)" \
|
|
LDFLAGS="$(NODEJS_LDFLAGS)" \
|
|
LD="$(TARGET_CXX)" \
|
|
LD="$(TARGET_CXX)" \
|
|
npm_config_arch=$(NODEJS_CPU) \
|
|
npm_config_arch=$(NODEJS_CPU) \
|
|
@@ -232,8 +238,15 @@ NPM = $(TARGET_CONFIGURE_OPTS) \
|
|
npm_config_build_from_source=true \
|
|
npm_config_build_from_source=true \
|
|
npm_config_nodedir=$(BUILD_DIR)/nodejs-$(NODEJS_VERSION) \
|
|
npm_config_nodedir=$(BUILD_DIR)/nodejs-$(NODEJS_VERSION) \
|
|
npm_config_prefix=$(TARGET_DIR)/usr \
|
|
npm_config_prefix=$(TARGET_DIR)/usr \
|
|
- npm_config_cache=$(BUILD_DIR)/.npm-cache \
|
|
|
|
- $(HOST_DIR)/bin/npm
|
|
|
|
|
|
+ npm_config_cache=$(BUILD_DIR)/.npm-cache
|
|
|
|
+
|
|
|
|
+# Define various packaging tools for other packages to use
|
|
|
|
+NPM = $(NODEJS_BIN_ENV) $(HOST_DIR)/bin/npm
|
|
|
|
+ifeq ($(BR2_PACKAGE_HOST_NODEJS_COREPACK),y)
|
|
|
|
+COREPACK = $(NODEJS_BIN_ENV) $(HOST_DIR)/bin/corepack
|
|
|
|
+PNPM = $(NODEJS_BIN_ENV) $(HOST_DIR)/bin/pnpm
|
|
|
|
+YARN = $(NODEJS_BIN_ENV) $(HOST_DIR)/bin/yarn
|
|
|
|
+endif
|
|
|
|
|
|
#
|
|
#
|
|
# We can only call NPM if there's something to install.
|
|
# We can only call NPM if there's something to install.
|