diff mbox

[2/4] package/nodejs: Update icu to use NODEJS_CONF_OPTS

Message ID 1464981346-11741-2-git-send-email-martin@barkynet.com
State Accepted
Headers show

Commit Message

Martin Bark June 3, 2016, 7:15 p.m. UTC 
Signed-off-by: Martin Bark <martin@barkynet.com>
---
 package/nodejs/nodejs.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Yann E. MORIN June 4, 2016, 10:07 a.m. UTC | #1 
Martin, All,

On 2016-06-03 20:15 +0100, Martin Bark spake thusly:
> Signed-off-by: Martin Bark <martin@barkynet.com>

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  package/nodejs/nodejs.mk | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
> index b78ba79..e5844b0 100644
> --- a/package/nodejs/nodejs.mk
> +++ b/package/nodejs/nodejs.mk
> @@ -25,6 +25,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
> @@ -104,7 +107,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)) \
> -- 
> 2.7.4
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
diff mbox

Patch

diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index b78ba79..e5844b0 100644
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -25,6 +25,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
@@ -104,7 +107,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)) \