]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
package/nodejs: Add NODEJS_CONF_OPTS
authorMartin Bark <martin@barkynet.com>
Fri, 3 Jun 2016 19:15:43 +0000 (20:15 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sat, 4 Jun 2016 12:31:44 +0000 (14:31 +0200)
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@barkynet.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/nodejs/nodejs.mk

index 0329299fe052735ded853d68de275ecb6acc3683..d2c5be44070bd929b960850d92a9c394940b0cfa 100644 (file)
@@ -13,6 +13,13 @@ 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 +104,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