-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bump version to 6.11.0 Add ICU dependency when using i18n Tweak fpu configs Signed-off-by: Adrian Panella <[email protected]>
- Loading branch information
Showing
1 changed file
with
58 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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,23 +8,24 @@ | |
| 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 | ||
|
|
||
| HOST_BUILD_PARALLEL:=1 | ||
| PKG_BUILD_PARALLEL:=1 | ||
|
|
||
| PKG_MAINTAINER:=John Crispin <[email protected]> | ||
| 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,34 +58,76 @@ 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,$(CPU_SUBTYPE)),) | ||
| CONFIGURE_ARGS+= --with-arm-fpu=vfp | ||
| endif | ||
|
|
||
| ifneq ($(findstring vfpv3,$(CPU_SUBTYPE)),) | ||
| CONFIGURE_ARGS+= --with-arm-fpu=vfpv3 | ||
| endif | ||
|
|
||
| ifneq ($(findstring vfpv3-d16,$(CPU_SUBTYPE)),) | ||
| CONFIGURE_ARGS+= --with-arm-fpu=vfpv3-d16 | ||
| endif | ||
|
|
||
| ifneq ($(findstring neon,$(CPU_SUBTYPE)),) | ||
| CONFIGURE_ARGS+= --with-arm-fpu=neon | ||
| endif | ||
|
|
||
| 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:= | ||
|
|
||
| HOST_CONFIGURE_ARGS:= \ | ||
| --dest-os=linux \ | ||
| --without-snapshot \ | ||
| --shared-zlib \ | ||
| --prefix=$(STAGING_DIR_HOSTPKG) | ||
|
|
||
| HOST_CONFIGURE_CMD:=python ./configure | ||
|
|
||