diff mbox

nodejs: unbreak 0.10.x host build

Message ID 20170122210551.9704-1-peter@korsgaard.com
State Accepted
Headers show

Commit Message

Peter Korsgaard Jan. 22, 2017, 9:05 p.m. UTC
Fixes:
http://autobuild.buildroot.net/results/833/8334631b54fdfd43d38ca00f42e4d5a98e3a70c4/
http://autobuild.buildroot.net/results/9c0/9c08e0b745fab671123facb4a46f60eec5afd718/

Commit 24d90db52a74 (package/nodejs: disable icu support for host build)
added --with-intl=none to host configure flags to fix an issue related to
icu.  The 0.10.x version unfortunately doesn't understand this configure
flag and errors out when provided, breaking the build:

configure: error: no such option: --with-intl

The 0.10.x version doesn't seem to have this icu issue (E.G. no autobuilder
issues before this commit and unable to reproduce locally), so fix it by
only passing --with-intl=none for the 6.9.x version.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/nodejs/nodejs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Thomas Petazzoni Jan. 23, 2017, 8:07 a.m. UTC | #1
Hello,

On Sun, 22 Jan 2017 22:05:51 +0100, Peter Korsgaard wrote:
> Fixes:
> http://autobuild.buildroot.net/results/833/8334631b54fdfd43d38ca00f42e4d5a98e3a70c4/
> http://autobuild.buildroot.net/results/9c0/9c08e0b745fab671123facb4a46f60eec5afd718/
> 
> Commit 24d90db52a74 (package/nodejs: disable icu support for host build)
> added --with-intl=none to host configure flags to fix an issue related to
> icu.  The 0.10.x version unfortunately doesn't understand this configure
> flag and errors out when provided, breaking the build:
> 
> configure: error: no such option: --with-intl
> 
> The 0.10.x version doesn't seem to have this icu issue (E.G. no autobuilder
> issues before this commit and unable to reproduce locally), so fix it by
> only passing --with-intl=none for the 6.9.x version.
> 
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
>  package/nodejs/nodejs.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas
diff mbox

Patch

diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index 82a012ad7..042cc3fb0 100644
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -63,7 +63,7 @@  define HOST_NODEJS_CONFIGURE_CMDS
 		--without-dtrace \
 		--without-etw \
 		--shared-zlib \
-		--with-intl=none \
+		$(if $(BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS),--with-intl=none) \
 	)
 endef