diff options
| author | Martin Bark <martin@barkynet.com> | 2016-06-09 09:48:33 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-06-09 10:51:01 +0200 |
| commit | 1a08bddc388c0d56ead16d4e827de8c33abdea35 (patch) | |
| tree | 8e8e3b5e505be8fe0312c2761dbc19a1563d6b49 /package/nodejs | |
| parent | f18d22e8342454c86281ed93734e8b56fae8b3a3 (diff) | |
| download | buildroot-1a08bddc388c0d56ead16d4e827de8c33abdea35.tar.gz buildroot-1a08bddc388c0d56ead16d4e827de8c33abdea35.zip | |
package/nodejs: remove icu support from 0.10.x
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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/nodejs')
| -rw-r--r-- | package/nodejs/nodejs.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index efd9308a8d..d6f115a510 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 |
