All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/nodejs: remove icu support from 0.10.x
@ 2016-06-09  8:48 Martin Bark
  2016-06-09  8:56 ` Thomas Petazzoni
  0 siblings, 1 reply; 2+ messages in thread
From: Martin Bark @ 2016-06-09  8:48 UTC (permalink / raw)
  To: buildroot

icu support was added to nodejs in commit 7d0702a, however, 0.10.x does
not have support for icu. The 0.10.x configure script will error
if it is passed the --with-intl option.  This commit removes icu support
from 0.10.x.

Fixes:
 http://autobuild.buildroot.net/results/932e4ec24623592255f234a098f7a90ef2ad8063

Signed-off-by: Martin Bark <martin@barkynet.com>
---
 package/nodejs/nodejs.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index efd9308..d6f115a 100644
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -27,12 +27,15 @@ else
 NODEJS_CONF_OPTS += --without-ssl
 endif
 
+# 0.10.x does not have icu support
+ifeq ($(findstring 0.10.,$(NODEJS_VERSION)),)
 ifeq ($(BR2_PACKAGE_ICU),y)
 NODEJS_DEPENDENCIES += icu
 NODEJS_CONF_OPTS += --with-intl=system-icu
 else
 NODEJS_CONF_OPTS += --with-intl=none
 endif
+endif
 
 ifneq ($(BR2_PACKAGE_NODEJS_NPM),y)
 NODEJS_CONF_OPTS += --without-npm
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [Buildroot] [PATCH 1/1] package/nodejs: remove icu support from 0.10.x
  2016-06-09  8:48 [Buildroot] [PATCH 1/1] package/nodejs: remove icu support from 0.10.x Martin Bark
@ 2016-06-09  8:56 ` Thomas Petazzoni
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2016-06-09  8:56 UTC (permalink / raw)
  To: buildroot

Hello,

On Thu,  9 Jun 2016 09:48:33 +0100, Martin Bark wrote:
> icu support was added to nodejs in commit 7d0702a, however, 0.10.x does
> not have support for icu. The 0.10.x configure script will error
> if it is passed the --with-intl option.  This commit removes icu support
> from 0.10.x.
> 
> Fixes:
>  http://autobuild.buildroot.net/results/932e4ec24623592255f234a098f7a90ef2ad8063
> 
> Signed-off-by: Martin Bark <martin@barkynet.com>
> ---
>  package/nodejs/nodejs.mk | 3 +++
>  1 file changed, 3 insertions(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-06-09  8:56 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-09  8:48 [Buildroot] [PATCH 1/1] package/nodejs: remove icu support from 0.10.x Martin Bark
2016-06-09  8:56 ` Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.