jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 14:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/nodejs: remove icu support from 0.10.x

Browse Source 
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>
This commit is contained in:
Martin Bark 2016-06-09 09:48:33 +01:00 committed by Thomas Petazzoni
parent f18d22e834
commit 1a08bddc38
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/nodejs/nodejs.mk
View File

@ -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