diff options
Diffstat (limited to 'package/nodejs')
| -rw-r--r-- | package/nodejs/Makefile | 30 | ||||
| -rw-r--r-- | package/nodejs/patches/patch-deps_v8_src_base_debug_stack_trace_posix_cc | 11 | ||||
| -rw-r--r-- | package/nodejs/patches/patch-deps_v8_src_log-utils_h | 11 |
3 files changed, 13 insertions, 39 deletions
diff --git a/package/nodejs/Makefile b/package/nodejs/Makefile index a3747b04f..02627aa6a 100644 --- a/package/nodejs/Makefile +++ b/package/nodejs/Makefile @@ -4,19 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= nodejs -PKG_VERSION:= 8.2.1 +PKG_VERSION:= 20.11.1 PKG_RELEASE:= 1 -PKG_HASH:= 66fe1379bc7daf9a16c6b5c45ab695bf1cdcfae9738d2989e940104d6b31973f +PKG_HASH:= 4af1ba6ea848cc05908b8a62b02fb27684dd52b2a7988ee82b0cfa72deb90b94 PKG_DESCR:= asynchronous event driven framework PKG_SECTION:= net/http PKG_DEPENDS:= zlib -PKG_BUILDDEP:= python2-host nodejs-host zlib +PKG_BUILDDEP:= python3-host nodejs-host zlib PKG_NEEDS:= threads c++ PKG_URL:= https://nodejs.org/ PKG_SITES:= https://nodejs.org/dist/v$(PKG_VERSION)/ -PKG_SYSTEM_DEPENDS:= !mikrotik-rb532 - DISTFILES:= node-v$(PKG_VERSION).tar.gz WRKDIST= $(WRKDIR)/node-v$(PKG_VERSION) @@ -26,17 +24,16 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,NODEJS,nodejs,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,NODEJS,nodejs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) +HOST_CFLAGS:= +HOST_CXXFLAGS:= HOST_STYLE:= manual CONFIG_STYLE:= manual host-configure: (cd $(WRKSRC); \ - PYTHON=$(STAGING_HOST_DIR)/usr/bin/python2 \ - $(STAGING_HOST_DIR)/usr/bin/python2 ./configure \ + PYTHON=$(STAGING_HOST_DIR)/usr/bin/python3 \ + $(STAGING_HOST_DIR)/usr/bin/python3 ./configure \ --prefix=/usr \ - --without-snapshot \ - --without-dtrace \ - --without-etw \ --without-intl \ --shared-zlib \ ) @@ -48,21 +45,20 @@ host-build: nodejs-hostinstall: cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ ${HOST_FAKE_FLAGS} DESTDIR='${STAGING_HOST_DIR}' ${HOST_INSTALL_TARGET} $(MAKE_TRACE) - $(INSTALL_BIN) ${WRKBUILD}/out/Release/mkpeephole ${STAGING_HOST_DIR}/usr/bin + $(INSTALL_BIN) ${WRKBUILD}/out/Release/node_js2c ${STAGING_HOST_DIR}/usr/bin + $(INSTALL_BIN) ${WRKBUILD}/out/Release/bytecode_builtins_list_generator ${STAGING_HOST_DIR}/usr/bin + $(INSTALL_BIN) ${WRKBUILD}/out/Release/torque ${STAGING_HOST_DIR}/usr/bin do-configure: (cd $(WRKSRC); \ - PYTHON=$(STAGING_HOST_DIR)/usr/bin/python2 \ - $(STAGING_HOST_DIR)/usr/bin/python2 ./configure \ + PYTHON=$(STAGING_HOST_DIR)/usr/bin/python3 \ + $(STAGING_HOST_DIR)/usr/bin/python3 ./configure \ --prefix=/usr \ --cross-compiling \ - --without-snapshot \ - --without-dtrace \ - --without-etw \ --without-intl \ --shared-zlib \ ) - $(SED) "s#<(mkpeephole_exec)#$(STAGING_HOST_DIR)/usr/bin/mkpeephole#g" $(WRKSRC)/deps/v8/src/v8.gyp +# $(SED) "s#<(mkpeephole_exec)#$(STAGING_HOST_DIR)/usr/bin/mkpeephole#g" $(WRKSRC)/deps/v8/src/v8.gyp nodejs-install: $(INSTALL_DIR) $(IDIR_NODEJS)/usr/lib diff --git a/package/nodejs/patches/patch-deps_v8_src_base_debug_stack_trace_posix_cc b/package/nodejs/patches/patch-deps_v8_src_base_debug_stack_trace_posix_cc deleted file mode 100644 index 433613981..000000000 --- a/package/nodejs/patches/patch-deps_v8_src_base_debug_stack_trace_posix_cc +++ /dev/null @@ -1,11 +0,0 @@ ---- node-v8.0.0.orig/deps/v8/src/base/debug/stack_trace_posix.cc 2017-05-30 19:31:35.000000000 +0200 -+++ node-v8.0.0/deps/v8/src/base/debug/stack_trace_posix.cc 2017-06-01 13:30:13.141625623 +0200 -@@ -25,7 +25,7 @@ - #include <string> - #include <vector> - --#if V8_LIBC_GLIBC || V8_LIBC_BSD || V8_LIBC_UCLIBC || V8_OS_SOLARIS -+#if V8_LIBC_GLIBC || V8_LIBC_BSD || V8_OS_SOLARIS - #define HAVE_EXECINFO_H 1 - #endif - diff --git a/package/nodejs/patches/patch-deps_v8_src_log-utils_h b/package/nodejs/patches/patch-deps_v8_src_log-utils_h deleted file mode 100644 index 4447e6403..000000000 --- a/package/nodejs/patches/patch-deps_v8_src_log-utils_h +++ /dev/null @@ -1,11 +0,0 @@ ---- node-v8.0.0.orig/deps/v8/src/log-utils.h 2017-05-30 19:31:39.000000000 +0200 -+++ node-v8.0.0/deps/v8/src/log-utils.h 2017-06-01 13:28:54.580576740 +0200 -@@ -9,6 +9,8 @@ - - #include <cstdarg> - -+#include <cstdarg> -+ - #include "src/allocation.h" - #include "src/base/compiler-specific.h" - #include "src/base/platform/mutex.h" |