[Buildroot] [PATCH 1/4] package/nodejs: Add NODEJS_CONF_OPTS
Martin Bark
martin at barkynet.com
Fri Jun 3 19:15:43 UTC 2016
Most packages in buildroot pass a FOO_CONF_OPTS variable into the
configure script. Transition nodejs to follow this convention.
Signed-off-by: Martin Bark <martin at barkynet.com>
---
package/nodejs/nodejs.mk | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index 0329299..b78ba79 100644
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -13,6 +13,12 @@ HOST_NODEJS_DEPENDENCIES = host-python host-zlib
NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components)
NODEJS_LICENSE_FILES = LICENSE
+NODEJS_CONF_OPTS = --without-snapshot \
+ --shared-zlib \
+ --without-dtrace \
+ --without-etw \
+ --dest-os=linux
+
ifeq ($(BR2_PACKAGE_OPENSSL),y)
NODEJS_DEPENDENCIES += openssl
endif
@@ -97,18 +103,14 @@ define NODEJS_CONFIGURE_CMDS
PYTHON=$(HOST_DIR)/usr/bin/python2 \
$(HOST_DIR)/usr/bin/python2 ./configure \
--prefix=/usr \
- --without-snapshot \
- --shared-zlib \
$(if $(BR2_PACKAGE_OPENSSL),--shared-openssl,--without-ssl) \
$(if $(BR2_PACKAGE_ICU),--with-intl=system-icu,--with-intl=none) \
$(if $(BR2_PACKAGE_NODEJS_NPM),,--without-npm) \
- --without-dtrace \
- --without-etw \
--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)) \
$(if $(NODEJS_MIPS_FPU_MODE),--with-mips-fpu-mode=$(NODEJS_MIPS_FPU_MODE)) \
- --dest-os=linux \
+ $(NODEJS_CONF_OPTS) \
)
endef
--
2.7.4
More information about the buildroot
mailing list