jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 22:26:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/nodejs: Update npm to use NODEJS_CONF_OPTS

Browse Source 
Signed-off-by: Martin Bark <martin@barkynet.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Martin Bark 2016-06-03 20:15:46 +01:00 committed by Thomas Petazzoni
parent 81bb80c89d
commit a898d5de17
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/nodejs/nodejs.mk
View File

@ -34,6 +34,10 @@ else
NODEJS_CONF_OPTS += --with-intl=none NODEJS_CONF_OPTS += --with-intl=none
endif endif
ifneq ($(BR2_PACKAGE_NODEJS_NPM),y)
NODEJS_CONF_OPTS += --without-npm
endif
# nodejs build system is based on python, but only support python-2.6 or # nodejs build system is based on python, but only support python-2.6 or
# python-2.7. So, we have to enforce PYTHON interpreter to be python2. # python-2.7. So, we have to enforce PYTHON interpreter to be python2.
define HOST_NODEJS_CONFIGURE_CMDS define HOST_NODEJS_CONFIGURE_CMDS
@ -110,7 +114,6 @@ define NODEJS_CONFIGURE_CMDS
PYTHON=$(HOST_DIR)/usr/bin/python2 \ PYTHON=$(HOST_DIR)/usr/bin/python2 \
$(HOST_DIR)/usr/bin/python2 ./configure \ $(HOST_DIR)/usr/bin/python2 ./configure \
--prefix=/usr \ --prefix=/usr \
$(if $(BR2_PACKAGE_NODEJS_NPM),,--without-npm) \
--dest-cpu=$(NODEJS_CPU) \ --dest-cpu=$(NODEJS_CPU) \
$(if $(NODEJS_ARM_FP),--with-arm-float-abi=$(NODEJS_ARM_FP)) \ $(if $(NODEJS_ARM_FP),--with-arm-float-abi=$(NODEJS_ARM_FP)) \
$(if $(NODEJS_MIPS_ARCH_VARIANT),--with-mips-arch-variant=$(NODEJS_MIPS_ARCH_VARIANT)) \ $(if $(NODEJS_MIPS_ARCH_VARIANT),--with-mips-arch-variant=$(NODEJS_MIPS_ARCH_VARIANT)) \