node: bump version and tweak config

Bump version to 6.11.0
Add ICU dependency when using i18n
Tweak fpu configs

Signed-off-by: Adrian Panella <ianchi74@outlook.com>

diff --git a/lang/node/Makefile b/lang/node/Makefile
index 4d72ffa88a74696745119ef728e4f3ede6dc69ea..42fea4f1620833e6ad67f206c4e1c3fc90f49dde 100644 (file)
--- a/lang/node/Makefile
+++ b/lang/node/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2016 OpenWrt.org
+# Copyright (C) 2006-2017 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,15 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=node
-PKG_VERSION:=v4.4.5
+PKG_VERSION:=v6.11.0
 PKG_RELEASE:=2
-
 PKG_SOURCE:=node-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://nodejs.org/dist/${PKG_VERSION}
-PKG_MD5SUM:=376140907bbe362f36065a30af04f020
+PKG_HASH:=02ba35391edea2b294c736489af01954ce6e6c39d318f4423ae6617c69ef0a51
 
 HOST_BUILD_DEPENDS:=python/host
 PKG_BUILD_DEPENDS:=python/host
+
 PKG_INSTALL:=1
 PKG_USE_MIPS16:=0
 
@@ -24,7 +24,8 @@ HOST_BUILD_PARALLEL:=1
 PKG_BUILD_PARALLEL:=1
 
 PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
-PKG_LICENSE:=
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
@@ -35,7 +36,7 @@ define Package/node
   SUBMENU:=Node.js
   TITLE:=Node.js is a platform built on Chrome's JavaScript runtime
   URL:=http://nodejs.org/
-  DEPENDS:=+libpthread +librt +libstdcpp +libopenssl +zlib
+  DEPENDS:=+libstdcpp +libopenssl +zlib +USE_UCLIBC:libpthread +USE_UCLIBC:librt +NODEJS_ICU:icu
 endef
 
 define Package/node/description
@@ -57,27 +58,69 @@ define Package/node-npm/description
        NPM is the package manager for NodeJS
 endef
 
-CPU:=$(subst aarch64,arm64,$(subst x86_64,x64,$(subst i386,ia32,$(ARCH))))
+define Package/node/config
+       menu "Module Selection"
+
+       config NODEJS_ICU
+               bool "enable i18n features"
+               default n
+
+       endmenu
+endef
+
+NODEJS_CPU:=$(subst powerpc,ppc,$(subst aarch64,arm64,$(subst x86_64,x64,$(subst i386,ia32,$(ARCH)))))
 
-MAKE_VARS += \
-       DESTCPU=$(CPU)
+MAKE_VARS+= \
+       DESTCPU=$(NODEJS_CPU)
 
-CONFIGURE_ARGS= \
-       --dest-cpu=$(CPU) \
+CONFIGURE_ARGS:= \
+       --dest-cpu=$(NODEJS_CPU) \
        --dest-os=linux \
        --without-snapshot \
        --shared-zlib \
        --shared-openssl \
        --prefix=/usr
 
-ifneq ($(findstring arm,$(ARCH)),)
+ifneq ($(findstring arm,$(NODEJS_CPU)),)
+ifeq ($(CONFIG_SOFT_FLOAT),y)
+CONFIGURE_ARGS+= with-arm-float-abi=softfp
+else
+
+CONFIGURE_ARGS+= --with-arm-float-abi=hard
+
+ifneq ($(findstring vfp,$(CONFIG_CPU_TYPE)),)
+ARM_FPU=vfp
+endif
+
+ifneq ($(findstring vfpv3,$(CONFIG_CPU_TYPE)),)
+ARM_FPU=vfpv3
+endif
+
+ifneq ($(findstring vfpv3-d16,$(CONFIG_CPU_TYPE)),)
+ARM_FPU=vfpv3-d16
+endif
+
+ifneq ($(findstring neon,$(CONFIG_CPU_TYPE)),)
+ARM_FPU=neon
+endif
+
+CONFIGURE_ARGS+= --with-arm-fpu=$(ARM_FPU)
+endif
+endif
+
+ifneq ($(findstring mips,$(NODEJS_CPU)),)
+ifeq ($(CONFIG_SOFT_FLOAT),y)
 CONFIGURE_ARGS+= \
-       $(if $(CONFIG_SOFT_FLOAT),--with-arm-float-abi=soft,--with-arm-float-abi=hard)
+       --with-mips-float-abi=soft
+endif
 endif
 
-ifneq ($(findstring mips,$(ARCH)),)
+ifeq ($(CONFIG_NODEJS_ICU),y)
 CONFIGURE_ARGS+= \
-       $(if $(CONFIG_SOFT_FLOAT),--with-mips-float-abi=soft,--with-mips-float-abi=hard)
+       --with-intl=system-icu
+else
+CONFIGURE_ARGS+= \
+       --with-intl=none
 endif
 
 HOST_CONFIGURE_VARS:=
@@ -85,6 +128,7 @@ HOST_CONFIGURE_VARS:=
 HOST_CONFIGURE_ARGS:= \
        --dest-os=linux \
        --without-snapshot \
+       --shared-zlib \
        --prefix=$(STAGING_DIR_HOSTPKG)
 
 HOST_CONFIGURE_CMD:=python ./configure