diff options
| author | Martin Bark <martin@barkynet.com> | 2016-06-03 20:15:46 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-06-04 14:32:16 +0200 |
| commit | a898d5de17f4b32ee29ff47734ff5717c6b40f03 (patch) | |
| tree | 3024a72823e870c3f8454552181a7942a4f1e5cf /package/nodejs | |
| parent | 81bb80c89d8051f412fde2f5964d057612c696c6 (diff) | |
| download | buildroot-a898d5de17f4b32ee29ff47734ff5717c6b40f03.tar.gz buildroot-a898d5de17f4b32ee29ff47734ff5717c6b40f03.zip | |
package/nodejs: Update npm to use NODEJS_CONF_OPTS
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>
Diffstat (limited to 'package/nodejs')
| -rw-r--r-- | package/nodejs/nodejs.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 0938652a2a..efd9308a8d 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -34,6 +34,10 @@ else NODEJS_CONF_OPTS += --with-intl=none 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 # python-2.7. So, we have to enforce PYTHON interpreter to be python2. define HOST_NODEJS_CONFIGURE_CMDS @@ -110,7 +114,6 @@ define NODEJS_CONFIGURE_CMDS PYTHON=$(HOST_DIR)/usr/bin/python2 \ $(HOST_DIR)/usr/bin/python2 ./configure \ --prefix=/usr \ - $(if $(BR2_PACKAGE_NODEJS_NPM),,--without-npm) \ --dest-cpu=$(NODEJS_CPU) \ $(if $(NODEJS_ARM_FP),--with-arm-float-abi=$(NODEJS_ARM_FP)) \ $(if $(NODEJS_MIPS_ARCH_VARIANT),--with-mips-arch-variant=$(NODEJS_MIPS_ARCH_VARIANT)) \ |
