Selaa lähdekoodia

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>
Martin Bark 9 vuotta sitten
vanhempi
commit
1a08bddc38
1 muutettua tiedostoa jossa 3 lisäystä ja 0 poistoa
  1. 3 0
      package/nodejs/nodejs.mk

+ 3 - 0
package/nodejs/nodejs.mk

@@ -27,12 +27,15 @@ else
 NODEJS_CONF_OPTS += --without-ssl
 NODEJS_CONF_OPTS += --without-ssl
 endif
 endif
 
 
+# 0.10.x does not have icu support
+ifeq ($(findstring 0.10.,$(NODEJS_VERSION)),)
 ifeq ($(BR2_PACKAGE_ICU),y)
 ifeq ($(BR2_PACKAGE_ICU),y)
 NODEJS_DEPENDENCIES += icu
 NODEJS_DEPENDENCIES += icu
 NODEJS_CONF_OPTS += --with-intl=system-icu
 NODEJS_CONF_OPTS += --with-intl=system-icu
 else
 else
 NODEJS_CONF_OPTS += --with-intl=none
 NODEJS_CONF_OPTS += --with-intl=none
 endif
 endif
+endif
 
 
 ifneq ($(BR2_PACKAGE_NODEJS_NPM),y)
 ifneq ($(BR2_PACKAGE_NODEJS_NPM),y)
 NODEJS_CONF_OPTS += --without-npm
 NODEJS_CONF_OPTS += --without-npm