From f31b77d5b50a155c648bdab6ab7cd2dcd918c418 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 5 Jan 2023 11:33:33 +0100
Subject: new package firefox, obsolete python2
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
package/nodejs/Makefile | 18 +++++++++---------
.../patch-deps_v8_src_base_debug_stack_trace_posix_cc | 11 -----------
package/nodejs/patches/patch-deps_v8_src_log-utils_h | 11 -----------
3 files changed, 9 insertions(+), 31 deletions(-)
delete mode 100644 package/nodejs/patches/patch-deps_v8_src_base_debug_stack_trace_posix_cc
delete mode 100644 package/nodejs/patches/patch-deps_v8_src_log-utils_h
(limited to 'package/nodejs')
diff --git a/package/nodejs/Makefile b/package/nodejs/Makefile
index db6b8a1d3..bb6f65f98 100644
--- a/package/nodejs/Makefile
+++ b/package/nodejs/Makefile
@@ -4,19 +4,17 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= nodejs
-PKG_VERSION:= 12.16.2
+PKG_VERSION:= 18.12.1
PKG_RELEASE:= 1
-PKG_HASH:= 48b21340eff95bfc6e7297e4a027f5db74d6d64257c476972a1b2f2fdccc9582
+PKG_HASH:= ba8174dda00d5b90943f37c6a180a1d37c861d91e04a4cb38dc1c0c74981c186
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,13 +24,15 @@ 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 \
@@ -52,8 +52,8 @@ nodejs-hostinstall:
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 \
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"
--
cgit v1.2.3