package/nodejs: Update icu to use NODEJS_CONF_OPTS
authorMartin Bark <martin@barkynet.com>
Fri, 3 Jun 2016 19:15:44 +0000 (20:15 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sat, 4 Jun 2016 12:31:52 +0000 (14:31 +0200)
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 d2c5be44070bd929b960850d92a9c394940b0cfa..68adbff9453fa7690863a3cb35c25774f450c2da 100644 (file)
@@ -26,6 +26,9 @@ endif
 
 ifeq ($(BR2_PACKAGE_ICU),y)
 NODEJS_DEPENDENCIES += icu
+NODEJS_CONF_OPTS += --with-intl=system-icu
+else
+NODEJS_CONF_OPTS += --with-intl=none
 endif
 
 # nodejs build system is based on python, but only support python-2.6 or
@@ -105,7 +108,6 @@ define NODEJS_CONFIGURE_CMDS
                $(HOST_DIR)/usr/bin/python2 ./configure \
                --prefix=/usr \
                $(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) \
                --dest-cpu=$(NODEJS_CPU) \
                $(if $(NODEJS_ARM_FP),--with-arm-float-abi=$(NODEJS_ARM_FP)) \