From: Martin Bark <martin@barkynet.com>
Date: Fri, 3 Jun 2016 19:15:44 +0000 (+0100)
Subject: package/nodejs: Update icu to use NODEJS_CONF_OPTS
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=be0d8ecc2762b3a2547b91cf8471c2a4c28cc942;p=buildroot.git

package/nodejs: Update icu 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>
---

diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index d2c5be4407..68adbff945 100644
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -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)) \