mirror of
https://github.com/kiddin9/op-packages.git
synced 2026-10-27 07:02:51 +08:00
🌴 Sync 2026-09-27 20:55:59
This commit is contained in:
1 parent
5c90f0aed1
commit
13668feb29
77 files changed
+2076
-94
No files matched your search
+277
@@ -0,0 +1,277 @@
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=node
|
||||
|
||||
ifeq ($(CONFIG_NODEJS_22),y)
|
||||
PKG_VERSION:=22.23.2
|
||||
PKG_RELEASE:=1
|
||||
PKG_HASH:=skip
|
||||
PATCH_DIR:=./patches/v22.x
|
||||
NODEJS_BIN_SUM:=b294a556e639d64338823920e5866c21c02741742d2e1529ee1a225c1ec9252a
|
||||
NODE_MODULE_VERSION:=127
|
||||
else
|
||||
ifeq ($(CONFIG_NODEJS_26),y)
|
||||
PKG_VERSION:=26.9.0
|
||||
PKG_RELEASE:=1
|
||||
PKG_HASH:=skip
|
||||
PATCH_DIR:=./patches/v26.x
|
||||
NODEJS_BIN_SUM:=03d9104fc4f19652e74480fed11c023d75981464b7292f21a601c3f95ce7d90d
|
||||
NODE_MODULE_VERSION:=147
|
||||
else
|
||||
PKG_VERSION:=24.21.0
|
||||
PKG_RELEASE:=1
|
||||
PKG_HASH:=skip
|
||||
PATCH_DIR:=./patches/v24.x
|
||||
NODEJS_BIN_SUM:=6e1db87ef58b8819e5d5402eff1536491b18edd8eb7bee5ef7897876e88dc5ff
|
||||
NODE_MODULE_VERSION:=137
|
||||
endif
|
||||
endif
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://mirrors.tencent.com/nodejs-release/v$(PKG_VERSION) \
|
||||
https://nodejs.org/dist/v$(PKG_VERSION)
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
|
||||
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-v$(PKG_VERSION)
|
||||
|
||||
PKG_MAINTAINER:=Hirokazu MORIKAWA <morikw2@gmail.com>
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
PKG_CPE_ID:=cpe:/a:nodejs:node.js
|
||||
|
||||
HOST_BUILD_DEPENDS:=python3/host python-setuptools/host
|
||||
HOST_BUILD_PARALLEL:=1
|
||||
|
||||
PKG_BUILD_DEPENDS:=python3/host python-setuptools/host
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
PKG_INSTALL:=1
|
||||
PKG_ASLR_PIE:=0
|
||||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/node
|
||||
SECTION:=lang
|
||||
CATEGORY:=Languages
|
||||
SUBMENU:=Node.js
|
||||
TITLE:=Node.js is a platform built on Chrome's JavaScript runtime
|
||||
URL:=https://nodejs.org/
|
||||
DEPENDS:=@HAS_FPU @(i386||x86_64||arm||aarch64||riscv64) \
|
||||
+libstdcpp +libopenssl +zlib +libnghttp2 \
|
||||
+libcares +libatomic +NODEJS_ICU_SYSTEM:icu +NODEJS_ICU_SYSTEM:icu-full-data
|
||||
ABI_VERSION:=$(NODE_MODULE_VERSION)
|
||||
endef
|
||||
|
||||
define Package/node/description
|
||||
Node.js® is a JavaScript runtime built on Chrome's V8 JavaScript engine. Node.js uses
|
||||
an event-driven, non-blocking I/O model that makes it lightweight and efficient. Node.js'
|
||||
package ecosystem, npm, is the largest ecosystem of open source libraries in the world.
|
||||
|
||||
*** The following preparations must be made on the host side. ***
|
||||
1. gcc 12.2 or higher is required.
|
||||
2. To build a 32-bit target, gcc-multilib, g++-multilib are required.
|
||||
3. Requires libatomic package. (If necessary, install the 32-bit library at the same time.)
|
||||
ex) sudo apt-get install gcc-multilib g++-multilib
|
||||
endef
|
||||
|
||||
define Package/node-npm
|
||||
SECTION:=lang
|
||||
CATEGORY:=Languages
|
||||
SUBMENU:=Node.js
|
||||
TITLE:=NPM stands for Node Package Manager
|
||||
URL:=https://www.npmjs.com/
|
||||
DEPENDS:=+node
|
||||
endef
|
||||
|
||||
define Package/node-npm/description
|
||||
NPM is the package manager for NodeJS
|
||||
endef
|
||||
|
||||
define Package/node/config
|
||||
menu "Configuration"
|
||||
|
||||
choice
|
||||
prompt "Version Selection"
|
||||
default NODEJS_22
|
||||
help
|
||||
Select node.js version.
|
||||
The host package version is also the same.
|
||||
|
||||
config NODEJS_22
|
||||
bool "22.x Maintenance LTS"
|
||||
|
||||
config NODEJS_24
|
||||
bool "24.x Active LTS"
|
||||
|
||||
config NODEJS_26
|
||||
bool "26.x Current"
|
||||
endchoice
|
||||
|
||||
if PACKAGE_node
|
||||
choice
|
||||
prompt "i18n features"
|
||||
default NODEJS_ICU_SMALL
|
||||
help
|
||||
Select i18n features
|
||||
|
||||
config NODEJS_ICU_NONE
|
||||
bool "Disable"
|
||||
|
||||
config NODEJS_ICU_SMALL
|
||||
bool "small-icu"
|
||||
|
||||
config NODEJS_ICU_SYSTEM
|
||||
depends on ARCH_64BIT
|
||||
bool "system-icu"
|
||||
|
||||
config NODEJS_FULL_ICU
|
||||
bool "full-icu"
|
||||
endchoice
|
||||
endif
|
||||
|
||||
config NODEJS_NPM_KEEP_CACHE
|
||||
bool "keep npm cache"
|
||||
help
|
||||
Keep npm package cache.
|
||||
More space will be consumed by the cache.
|
||||
default n
|
||||
|
||||
config NODEJS_NPM_CACHE_DIR
|
||||
string "Set npm cache directory" if NODEJS_NPM_KEEP_CACHE
|
||||
default ""
|
||||
help
|
||||
Store npm cache in this directory.
|
||||
If not set, uses './tmp'
|
||||
|
||||
config NODEJS_HOST_BIN
|
||||
bool "Install the official nodejs binary package as HOSTPKG"
|
||||
depends on HOST_OS_LINUX
|
||||
help
|
||||
Reduce build time for the host package.
|
||||
default y
|
||||
|
||||
endmenu
|
||||
endef
|
||||
|
||||
NODEJS_CPU:=$(subst aarch64,arm64,$(subst x86_64,x64,$(subst i386,ia32,$(ARCH))))
|
||||
|
||||
ifneq ($(CONFIG_ARCH_64BIT),y)
|
||||
FORCE_32BIT:=-m32
|
||||
endif
|
||||
|
||||
MAKE_VARS+= \
|
||||
DESTCPU=$(NODEJS_CPU) \
|
||||
NO_LOAD='cctest.target.mk embedtest.target.mk node_mksnapshot.target.mk overlapped-checker.target.mk \
|
||||
mkcodecache.target.mk tools/v8_gypfiles/torque_base.target.mk tools/v8_gypfiles/v8_init.target.mk' \
|
||||
LD_LIBRARY_PATH=$(STAGING_DIR_HOSTPKG)/share/icu/current/lib
|
||||
|
||||
HOST_MAKE_VARS+=NO_LOAD='cctest.target.mk embedtest.target.mk overlapped-checker.target.mk'
|
||||
|
||||
CONFIGURE_VARS:= \
|
||||
CC="$(TARGET_CC) $(TARGET_OPTIMIZATION)" \
|
||||
CXX="$(TARGET_CXX) $(TARGET_OPTIMIZATION)" \
|
||||
CC_host="$(HOSTCC) $(FORCE_32BIT)" \
|
||||
CXX_host="$(HOSTCXX) $(FORCE_32BIT)"
|
||||
|
||||
CONFIGURE_ARGS:= \
|
||||
--dest-cpu=$(NODEJS_CPU) \
|
||||
--dest-os=linux \
|
||||
--cross-compiling \
|
||||
--shared-zlib \
|
||||
--shared-openssl \
|
||||
--shared-nghttp2 \
|
||||
--shared-cares \
|
||||
$(if $(CONFIG_NODEJS_26),--v8-disable-temporal-support) \
|
||||
$(if $(CONFIG_NODEJS_26),$(if $(CONFIG_ARCH_64BIT),,--without-ffi)) \
|
||||
--with-intl=$(if $(CONFIG_NODEJS_ICU_SMALL),small-icu,$(if $(CONFIG_NODEJS_ICU_SYSTEM),system-icu,$(if $(CONFIG_NODEJS_FULL_ICU),full-icu,none))) \
|
||||
$(if $(findstring +neon",$(CONFIG_CPU_TYPE)),--with-arm-fpu=neon) \
|
||||
$(if $(findstring +neon-vfpv4",$(CONFIG_CPU_TYPE)),--with-arm-fpu=neon) \
|
||||
$(if $(findstring +vfpv4",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfpv3) \
|
||||
$(if $(findstring +vfp",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfp) \
|
||||
$(if $(findstring +vfpv3",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfpv3) \
|
||||
$(if $(findstring +vfpv3-d16",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfpv3-d16) \
|
||||
--prefix=/usr
|
||||
|
||||
HOST_CONFIGURE_VARS:=
|
||||
HOST_CONFIGURE_ARGS:= \
|
||||
--dest-os=$(if $(findstring Darwin,$(HOST_OS)),mac,linux) \
|
||||
--with-intl=small-icu \
|
||||
--prefix=$(STAGING_DIR_HOSTPKG)
|
||||
|
||||
define Build/InstallDev
|
||||
$(INSTALL_DIR) $(1)/usr/include
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
|
||||
endef
|
||||
|
||||
define Package/node/install
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/node $(1)/usr/bin/
|
||||
endef
|
||||
|
||||
define Package/node-npm/install
|
||||
$(INSTALL_DIR) $(1)/usr/lib/node_modules/npm
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/npm/{package.json,LICENSE} \
|
||||
$(1)/usr/lib/node_modules/npm/
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/npm/README.md \
|
||||
$(1)/usr/lib/node_modules/npm/
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/npm/{node_modules,bin,lib} \
|
||||
$(1)/usr/lib/node_modules/npm/
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
$(LN) ../lib/node_modules/npm/bin/npm-cli.js $(1)/usr/bin/npm
|
||||
$(LN) ../lib/node_modules/npm/bin/npx-cli.js $(1)/usr/bin/npx
|
||||
endef
|
||||
|
||||
define Package/node-npm/postrm
|
||||
#!/bin/sh
|
||||
rm -rf /usr/lib/node_modules/npm || true
|
||||
endef
|
||||
|
||||
ifeq ($(CONFIG_NODEJS_HOST_BIN),y)
|
||||
|
||||
NODEJS_BIN:=node-v$(PKG_VERSION)-linux-x64.tar.gz
|
||||
|
||||
define Download/nodebin
|
||||
URL:=https://nodejs.org/download/release/v$(PKG_VERSION)/
|
||||
FILE:=$(NODEJS_BIN)
|
||||
HASH:=skip
|
||||
endef
|
||||
|
||||
define Host/Prepare
|
||||
$(eval $(call Download,nodebin))
|
||||
endef
|
||||
|
||||
define Host/Configure
|
||||
# nothing to do
|
||||
endef
|
||||
|
||||
define Host/Compile
|
||||
# nothing to do
|
||||
endef
|
||||
|
||||
define Host/Install
|
||||
rm -f $(1)/bin/npm
|
||||
rm -f $(1)/bin/npx
|
||||
rm -rf $(1)/lib/node_modules/npm
|
||||
rm -f $(1)/bin/corepack
|
||||
rm -rf $(1)/lib/node_modules/corepack
|
||||
$(TAR) xvf $(DL_DIR)/$(NODEJS_BIN) -C $(1) --strip-components=1
|
||||
rm -f $(1)/{CHANGELOG.md,LICENSE,README.md}
|
||||
endef
|
||||
|
||||
else
|
||||
define Host/Install
|
||||
rm -f $(1)/bin/npm
|
||||
rm -f $(1)/bin/npx
|
||||
rm -rf $(1)/lib/node_modules/npm
|
||||
rm -f $(1)/bin/corepack
|
||||
rm -rf $(1)/lib/node_modules/corepack
|
||||
$(call Host/Install/Default)
|
||||
endef
|
||||
endif
|
||||
|
||||
$(eval $(call HostBuild))
|
||||
$(eval $(call BuildPackage,node))
|
||||
$(eval $(call BuildPackage,node-npm))
|
||||
@@ -0,0 +1,12 @@
|
||||
--- a/lib/internal/modules/cjs/loader.js
|
||||
+++ b/lib/internal/modules/cjs/loader.js
|
||||
@@ -2026,7 +2026,8 @@ Module._initPaths = function() {
|
||||
path.resolve(process.execPath, '..') :
|
||||
path.resolve(process.execPath, '..', '..');
|
||||
|
||||
- const paths = [path.resolve(prefixDir, 'lib', 'node')];
|
||||
+ const paths = [path.resolve(prefixDir, 'lib', 'node'),
|
||||
+ path.resolve(prefixDir, 'lib', 'node_modules')];
|
||||
|
||||
if (homeDir) {
|
||||
ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries'));
|
||||
@@ -0,0 +1,42 @@
|
||||
--- a/deps/v8/src/base/platform/condition-variable.cc
|
||||
+++ b/deps/v8/src/base/platform/condition-variable.cc
|
||||
@@ -20,7 +20,7 @@ namespace base {
|
||||
|
||||
ConditionVariable::ConditionVariable() {
|
||||
#if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
|
||||
- (V8_OS_LINUX && V8_LIBC_GLIBC))
|
||||
+ V8_OS_LINUX)
|
||||
// On Free/Net/OpenBSD and Linux with glibc we can change the time
|
||||
// source for pthread_cond_timedwait() to use the monotonic clock.
|
||||
pthread_condattr_t attr;
|
||||
@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
|
||||
&native_handle_, &mutex->native_handle(), &ts);
|
||||
#else
|
||||
#if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
|
||||
- (V8_OS_LINUX && V8_LIBC_GLIBC))
|
||||
+ V8_OS_LINUX)
|
||||
// On Free/Net/OpenBSD and Linux with glibc we can change the time
|
||||
// source for pthread_cond_timedwait() to use the monotonic clock.
|
||||
result = clock_gettime(CLOCK_MONOTONIC, &ts);
|
||||
--- a/deps/v8/src/base/platform/platform-posix.cc
|
||||
+++ b/deps/v8/src/base/platform/platform-posix.cc
|
||||
@@ -1219,7 +1219,7 @@ bool Thread::Start() {
|
||||
#if V8_OS_DARWIN
|
||||
// Default on Mac OS X is 512kB -- bump up to 1MB
|
||||
stack_size = 1 * 1024 * 1024;
|
||||
-#elif V8_OS_AIX
|
||||
+#elif V8_OS_AIX || !defined(__GLIBC__)
|
||||
// Default on AIX is 96kB -- bump up to 2MB
|
||||
stack_size = 2 * 1024 * 1024;
|
||||
#endif
|
||||
--- a/deps/v8/src/codegen/external-reference-table.cc
|
||||
+++ b/deps/v8/src/codegen/external-reference-table.cc
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "src/ic/stub-cache.h"
|
||||
#include "src/logging/counters.h"
|
||||
|
||||
-#if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
|
||||
+#if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID) && defined(V8_LIBC_GLIBC)
|
||||
#define SYMBOLIZE_FUNCTION
|
||||
#include <execinfo.h>
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/tools/gyp/pylib/gyp/generator/make.py
|
||||
+++ b/tools/gyp/pylib/gyp/generator/make.py
|
||||
@@ -208,7 +208,7 @@ cmd_solink_module = $(LINK.$(TOOLSET)) -
|
||||
|
||||
LINK_COMMANDS_MAC = """\
|
||||
quiet_cmd_alink = LIBTOOL-STATIC $@
|
||||
-cmd_alink = rm -f $@ && %(python)s gyp-mac-tool filter-libtool libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %%.o,$^)
|
||||
+cmd_alink = rm -f $@ && %(python)s gyp-mac-tool filter-libtool /usr/bin/libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %%.o,$^)
|
||||
|
||||
quiet_cmd_link = LINK($(TOOLSET)) $@
|
||||
cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o "$@" $(LD_INPUTS) $(LIBS)
|
||||
@@ -0,0 +1,20 @@
|
||||
--- a/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js
|
||||
+++ b/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js
|
||||
@@ -1212,7 +1212,7 @@ const definitions = {
|
||||
},
|
||||
}),
|
||||
loglevel: new Definition('loglevel', {
|
||||
- default: 'notice',
|
||||
+ default: 'info',
|
||||
type: [
|
||||
'silent',
|
||||
'error',
|
||||
@@ -1993,7 +1993,7 @@ const definitions = {
|
||||
flatten,
|
||||
}),
|
||||
'strict-ssl': new Definition('strict-ssl', {
|
||||
- default: true,
|
||||
+ default: false,
|
||||
type: Boolean,
|
||||
description: `
|
||||
Whether or not to do SSL key validation when making requests to the
|
||||
@@ -0,0 +1,10 @@
|
||||
--- a/deps/uv/uv.gyp
|
||||
+++ b/deps/uv/uv.gyp
|
||||
@@ -156,6 +156,7 @@
|
||||
'target_name': 'libuv',
|
||||
'toolsets': ['host', 'target'],
|
||||
'type': '<(uv_library)',
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'include',
|
||||
'src/',
|
||||
@@ -0,0 +1,10 @@
|
||||
--- a/deps/zlib/zlib.gyp
|
||||
+++ b/deps/zlib/zlib.gyp
|
||||
@@ -8,6 +8,7 @@
|
||||
'use_system_zlib%': 0,
|
||||
'arm_fpu%': '',
|
||||
},
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'conditions': [
|
||||
['use_system_zlib==0', {
|
||||
'targets': [
|
||||
@@ -0,0 +1,18 @@
|
||||
--- a/node.gyp
|
||||
+++ b/node.gyp
|
||||
@@ -1141,6 +1141,7 @@
|
||||
'includes': [
|
||||
'node.gypi'
|
||||
],
|
||||
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'include_dirs': [
|
||||
'src',
|
||||
'tools/msvs/genfiles',
|
||||
@@ -1357,6 +1358,7 @@
|
||||
'tools',
|
||||
'src',
|
||||
],
|
||||
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'sources': [
|
||||
'tools/js2c.cc',
|
||||
'tools/executable_wrapper.h',
|
||||
@@ -0,0 +1,106 @@
|
||||
--- a/tools/icu/icu-generic.gyp
|
||||
+++ b/tools/icu/icu-generic.gyp
|
||||
@@ -106,6 +106,7 @@
|
||||
'sources': [
|
||||
'<@(icu_src_i18n)'
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/i18n',
|
||||
],
|
||||
@@ -114,6 +115,7 @@
|
||||
],
|
||||
'dependencies': [ 'icuucx', 'icu_implementation', 'icu_uconfig', 'icu_uconfig_target' ],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/i18n',
|
||||
],
|
||||
@@ -223,6 +225,7 @@
|
||||
# full data - no trim needed
|
||||
'sources': [ '<(SHARED_INTERMEDIATE_DIR)/icudt<(icu_ver_major)_dat.<(icu_asm_ext)' ],
|
||||
'dependencies': [ 'genccode#host', 'icupkg#host', 'icu_implementation#host', 'icu_uconfig' ],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
],
|
||||
@@ -307,6 +310,7 @@
|
||||
# This file contains the small ICU data
|
||||
'sources': [ '<(SHARED_INTERMEDIATE_DIR)/icusmdt<(icu_ver_major)_dat.<(icu_asm_ext)' ],
|
||||
# for umachine.h
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
],
|
||||
@@ -323,6 +327,7 @@
|
||||
'sources': [
|
||||
'<@(icu_src_stubdata)'
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
],
|
||||
@@ -362,6 +367,7 @@
|
||||
'_XOPEN_SOURCE_EXTENDED=0',
|
||||
]}],
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
],
|
||||
@@ -371,6 +377,7 @@
|
||||
'cflags_c': ['-std=c99'],
|
||||
'export_dependent_settings': [ 'icu_uconfig', 'icu_uconfig_target' ],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
],
|
||||
@@ -401,6 +408,7 @@
|
||||
'<(icu_path)/source/tools/toolutil/dbgutil.cpp',
|
||||
'<(icu_path)/source/tools/toolutil/dbgutil.h',
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
'<(icu_path)/source/i18n',
|
||||
@@ -420,6 +428,7 @@
|
||||
}]
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
'<(icu_path)/source/i18n',
|
||||
@@ -441,6 +450,7 @@
|
||||
'target_name': 'genrb',
|
||||
'type': 'executable',
|
||||
'toolsets': [ 'host' ],
|
||||
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'dependencies': [ 'icutools', 'icu_implementation' ],
|
||||
'sources': [
|
||||
'<@(icu_src_genrb)'
|
||||
@@ -463,6 +473,7 @@
|
||||
'target_name': 'iculslocs',
|
||||
'toolsets': [ 'host' ],
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'dependencies': [ 'icutools' ],
|
||||
'sources': [
|
||||
'iculslocs.cc',
|
||||
@@ -481,6 +492,7 @@
|
||||
'target_name': 'icupkg',
|
||||
'toolsets': [ 'host' ],
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'dependencies': [ 'icutools' ],
|
||||
'sources': [
|
||||
'<@(icu_src_icupkg)',
|
||||
@@ -498,6 +510,7 @@
|
||||
'target_name': 'genccode',
|
||||
'toolsets': [ 'host' ],
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'dependencies': [ 'icutools' ],
|
||||
'sources': [
|
||||
'<@(icu_src_genccode)',
|
||||
@@ -0,0 +1,166 @@
|
||||
--- a/tools/v8_gypfiles/v8.gyp
|
||||
+++ b/tools/v8_gypfiles/v8.gyp
|
||||
@@ -90,6 +90,7 @@
|
||||
],
|
||||
'hard_dependency': 1,
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(SHARED_INTERMEDIATE_DIR)',
|
||||
],
|
||||
@@ -211,6 +212,7 @@
|
||||
'<@(torque_outputs_cc)',
|
||||
'<@(torque_outputs_inc)',
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(SHARED_INTERMEDIATE_DIR)',
|
||||
],
|
||||
@@ -232,6 +234,7 @@
|
||||
'sources': [
|
||||
'<(generate_bytecode_builtins_list_output)',
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(generate_bytecode_output_root)',
|
||||
'<(SHARED_INTERMEDIATE_DIR)',
|
||||
@@ -270,6 +273,7 @@
|
||||
'sources': [
|
||||
'<(V8_ROOT)/src/init/setup-isolate-full.cc',
|
||||
],
|
||||
+ 'include_dirs': [ '../../deps/v8/third_party/abseil-cpp', '<!@(echo "$STAGING_DIR"/usr/../usr/include)' ],
|
||||
}, # v8_init
|
||||
{
|
||||
# This target is used to work around a GCC issue that causes the
|
||||
@@ -311,9 +315,11 @@
|
||||
'v8_pch',
|
||||
'abseil.gyp:abseil',
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(SHARED_INTERMEDIATE_DIR)',
|
||||
'<(generate_bytecode_output_root)',
|
||||
+ '../../deps/v8/third_party/abseil-cpp', '<!@(echo "$STAGING_DIR"/usr/../usr/include)',
|
||||
],
|
||||
'sources': [
|
||||
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_initializers.*?sources = ")',
|
||||
@@ -842,6 +848,7 @@
|
||||
'toolsets': ['host', 'target'],
|
||||
'direct_dependent_settings': {
|
||||
'sources': ['<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources = ")'],
|
||||
+ 'include_dirs': [ '../../deps/v8/third_party/abseil-cpp', '<!@(echo "$STAGING_DIR"/usr/../usr/include)' ],
|
||||
'conditions': [
|
||||
['v8_target_arch=="ia32"', {
|
||||
'sources': [
|
||||
@@ -956,6 +963,8 @@
|
||||
'target_name': 'v8_turboshaft',
|
||||
'type': 'static_library',
|
||||
'toolsets': ['host', 'target'],
|
||||
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
+ 'include_dirs': [ '../../deps/v8/third_party/abseil-cpp', '<!@(echo "$STAGING_DIR"/usr/../usr/include)' ],
|
||||
'dependencies': [
|
||||
'generate_bytecode_builtins_list',
|
||||
'run_torque',
|
||||
@@ -995,6 +1004,7 @@
|
||||
'run_torque',
|
||||
'v8_maybe_icu',
|
||||
],
|
||||
+ 'include_dirs': [ '../../deps/v8/third_party/abseil-cpp', '<!@(echo "$STAGING_DIR"/usr/../usr/include)' ],
|
||||
'conditions': [
|
||||
['(is_component_build and not v8_optimized_debug and v8_enable_fast_mksnapshot) or v8_enable_turbofan==0', {
|
||||
'dependencies': [
|
||||
@@ -1090,6 +1100,7 @@
|
||||
],
|
||||
'includes': ['inspector.gypi'],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(generate_bytecode_output_root)',
|
||||
'<(SHARED_INTERMEDIATE_DIR)',
|
||||
@@ -1749,6 +1760,7 @@
|
||||
}],
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(V8_ROOT)/include',
|
||||
],
|
||||
@@ -1769,6 +1781,7 @@
|
||||
{
|
||||
'target_name': 'bytecode_builtins_list_generator',
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'conditions': [
|
||||
['want_separate_host_toolset', {
|
||||
'toolsets': ['host'],
|
||||
@@ -1797,6 +1810,9 @@
|
||||
{
|
||||
'target_name': 'mksnapshot',
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
+ 'library_dirs':[ '../../../../staging_dir/hostpkg/share/icu/current/lib' ],
|
||||
+ 'include_dirs': [ '../../deps/v8/third_party/abseil-cpp', '<!@(echo "$STAGING_DIR"/usr/../usr/include)' ],
|
||||
'dependencies': [
|
||||
'v8_base_without_compiler',
|
||||
'v8_compiler_for_mksnapshot',
|
||||
@@ -1825,6 +1841,7 @@
|
||||
{
|
||||
'target_name': 'torque',
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'dependencies': [
|
||||
'torque_base',
|
||||
# "build/win:default_exe_manifest",
|
||||
@@ -1867,6 +1884,7 @@
|
||||
{
|
||||
'target_name': 'torque-language-server',
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'conditions': [
|
||||
['want_separate_host_toolset', {
|
||||
'toolsets': ['host'],
|
||||
@@ -1898,6 +1916,8 @@
|
||||
{
|
||||
'target_name': 'gen-regexp-special-case',
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
+ 'library_dirs':[ '../../../../staging_dir/hostpkg/share/icu/current/lib' ],
|
||||
'dependencies': [
|
||||
'v8_libbase',
|
||||
# "build/win:default_exe_manifest",
|
||||
@@ -2138,6 +2158,7 @@
|
||||
}],
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(V8_ROOT)/include',
|
||||
],
|
||||
@@ -2277,15 +2298,19 @@
|
||||
}],
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(V8_ROOT)/third_party/zlib',
|
||||
'<(V8_ROOT)/third_party/zlib/google',
|
||||
+ '../../deps/v8/third_party/abseil-cpp', '<!@(echo "$STAGING_DIR"/usr/../usr/include)',
|
||||
],
|
||||
},
|
||||
'defines': [ 'ZLIB_IMPLEMENTATION' ],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(V8_ROOT)/third_party/zlib',
|
||||
'<(V8_ROOT)/third_party/zlib/google',
|
||||
+ '../../deps/v8/third_party/abseil-cpp', '<!@(echo "$STAGING_DIR"/usr/../usr/include)',
|
||||
],
|
||||
'sources': [
|
||||
'<(V8_ROOT)/third_party/zlib/adler32.c',
|
||||
@@ -2330,6 +2355,7 @@
|
||||
'variables': {
|
||||
'FP16_ROOT': '../../deps/v8/third_party/fp16',
|
||||
},
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'direct_dependent_settings': {
|
||||
'include_dirs': [
|
||||
'<(FP16_ROOT)/src/include',
|
||||
@@ -0,0 +1,19 @@
|
||||
--- a/tools/v8_gypfiles/abseil.gyp
|
||||
+++ b/tools/v8_gypfiles/abseil.gyp
|
||||
@@ -9,13 +9,16 @@
|
||||
'ABSEIL_ROOT': '../../deps/v8/third_party/abseil-cpp',
|
||||
},
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(ABSEIL_ROOT)',
|
||||
],
|
||||
},
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(ABSEIL_ROOT)',
|
||||
],
|
||||
+ 'include_dirs': [ '<(ABSEIL_ROOT)', '<!@(echo "$STAGING_DIR"/usr/../usr/include)' ],
|
||||
'sources': [
|
||||
'<(ABSEIL_ROOT)/absl/algorithm/algorithm.h',
|
||||
'<(ABSEIL_ROOT)/absl/algorithm/container.h',
|
||||
@@ -0,0 +1,10 @@
|
||||
--- a/deps/v8/src/base/small-vector.h
|
||||
+++ b/deps/v8/src/base/small-vector.h
|
||||
@@ -22,7 +22,6 @@ template <typename T, size_t kSize, type
|
||||
class SmallVector {
|
||||
// Currently only support trivially copyable and trivially destructible data
|
||||
// types, as it uses memcpy to copy elements and never calls destructors.
|
||||
- ASSERT_TRIVIALLY_COPYABLE(T);
|
||||
static_assert(std::is_trivially_destructible<T>::value);
|
||||
|
||||
public:
|
||||
@@ -0,0 +1,38 @@
|
||||
--- a/deps/v8/src/compiler/backend/ia32/instruction-selector-ia32.cc
|
||||
+++ b/deps/v8/src/compiler/backend/ia32/instruction-selector-ia32.cc
|
||||
@@ -1161,7 +1161,7 @@ template <typename Adapter>
|
||||
void VisitAtomicExchange(InstructionSelectorT<Adapter>* selector,
|
||||
typename Adapter::node_t node, ArchOpcode opcode,
|
||||
MachineRepresentation rep) {
|
||||
- using node_t = Adapter::node_t;
|
||||
+ using node_t = typename Adapter::node_t;
|
||||
IA32OperandGeneratorT<Adapter> g(selector);
|
||||
node_t base = selector->input_at(node, 0);
|
||||
node_t index = selector->input_at(node, 1);
|
||||
@@ -1732,7 +1732,7 @@ template <typename Adapter>
|
||||
void VisitWord32PairShift(InstructionSelectorT<Adapter>* selector,
|
||||
InstructionCode opcode,
|
||||
typename Adapter::node_t node) {
|
||||
- using node_t = Adapter::node_t;
|
||||
+ using node_t = typename Adapter::node_t;
|
||||
IA32OperandGeneratorT<Adapter> g(selector);
|
||||
|
||||
node_t shift = selector->input_at(node, 2);
|
||||
@@ -2507,7 +2507,7 @@ template <typename Adapter>
|
||||
void VisitAtomicBinOp(InstructionSelectorT<Adapter>* selector,
|
||||
typename Adapter::node_t node, ArchOpcode opcode,
|
||||
MachineRepresentation rep) {
|
||||
- using node_t = Adapter::node_t;
|
||||
+ using node_t = typename Adapter::node_t;
|
||||
AddressingMode addressing_mode;
|
||||
IA32OperandGeneratorT<Adapter> g(selector);
|
||||
node_t base = selector->input_at(node, 0);
|
||||
@@ -2528,7 +2528,7 @@ void VisitAtomicBinOp(InstructionSelecto
|
||||
template <typename Adapter>
|
||||
void VisitPairAtomicBinOp(InstructionSelectorT<Adapter>* selector,
|
||||
typename Adapter::node_t node, ArchOpcode opcode) {
|
||||
- using node_t = Adapter::node_t;
|
||||
+ using node_t = typename Adapter::node_t;
|
||||
IA32OperandGeneratorT<Adapter> g(selector);
|
||||
node_t base = selector->input_at(node, 0);
|
||||
node_t index = selector->input_at(node, 1);
|
||||
@@ -0,0 +1,29 @@
|
||||
Description: do not use dns.ADDRCONFIG for localhost
|
||||
it fails on IPv6-only systems. Setting it with libc fails on linux.
|
||||
https://github.com/nodejs/node/issues/33279
|
||||
Author: Jérémy Lal <kapouer@melix.org>
|
||||
Last-Update: 2020-06-11
|
||||
Bug-Debian: https://bugs.debian.org/962318
|
||||
Forwarded: https://github.com/nodejs/node/issues/33816
|
||||
--- a/lib/net.js
|
||||
+++ b/lib/net.js
|
||||
@@ -1,4 +1,5 @@
|
||||
// Copyright Joyent, Inc. and other Node contributors.
|
||||
+
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a
|
||||
// copy of this software and associated documentation files (the
|
||||
@@ -1372,13 +1373,6 @@ function lookupAndConnect(self, options)
|
||||
hints: options.hints || 0,
|
||||
};
|
||||
|
||||
- if (!isWindows &&
|
||||
- dnsopts.family !== 4 &&
|
||||
- dnsopts.family !== 6 &&
|
||||
- dnsopts.hints === 0) {
|
||||
- dnsopts.hints = dns.ADDRCONFIG;
|
||||
- }
|
||||
-
|
||||
debug('connect: find host', host);
|
||||
debug('connect: dns options', dnsopts);
|
||||
self._host = host;
|
||||
@@ -0,0 +1,10 @@
|
||||
--- a/node.gyp
|
||||
+++ b/node.gyp
|
||||
@@ -1142,6 +1142,7 @@
|
||||
'node.gypi'
|
||||
],
|
||||
'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
+ 'cflags!': ['-mbranch-protection=standard'],
|
||||
'include_dirs': [
|
||||
'src',
|
||||
'tools/msvs/genfiles',
|
||||
@@ -0,0 +1,12 @@
|
||||
--- a/lib/internal/modules/cjs/loader.js
|
||||
+++ b/lib/internal/modules/cjs/loader.js
|
||||
@@ -2176,7 +2176,8 @@ Module._initPaths = function() {
|
||||
path.resolve(process.execPath, '..') :
|
||||
path.resolve(process.execPath, '..', '..');
|
||||
|
||||
- const paths = [path.resolve(prefixDir, 'lib', 'node')];
|
||||
+ const paths = [path.resolve(prefixDir, 'lib', 'node'),
|
||||
+ path.resolve(prefixDir, 'lib', 'node_modules')];
|
||||
|
||||
if (homeDir) {
|
||||
ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries'));
|
||||
@@ -0,0 +1,22 @@
|
||||
--- a/deps/v8/src/base/platform/platform-posix.cc
|
||||
+++ b/deps/v8/src/base/platform/platform-posix.cc
|
||||
@@ -1261,7 +1261,7 @@ bool Thread::Start() {
|
||||
#if V8_OS_DARWIN
|
||||
// Default on Mac OS X is 512kB -- bump up to 1MB
|
||||
stack_size = 1 * 1024 * 1024;
|
||||
-#elif V8_OS_AIX
|
||||
+#elif V8_OS_AIX || !defined(__GLIBC__)
|
||||
// Default on AIX is 96kB -- bump up to 2MB
|
||||
stack_size = 2 * 1024 * 1024;
|
||||
#endif
|
||||
--- a/deps/v8/src/codegen/external-reference-table.cc
|
||||
+++ b/deps/v8/src/codegen/external-reference-table.cc
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "src/ic/stub-cache.h"
|
||||
#include "src/logging/counters.h"
|
||||
|
||||
-#if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
|
||||
+#if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID) && defined(V8_LIBC_GLIBC)
|
||||
#define SYMBOLIZE_FUNCTION
|
||||
#include <execinfo.h>
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/tools/gyp/pylib/gyp/generator/make.py
|
||||
+++ b/tools/gyp/pylib/gyp/generator/make.py
|
||||
@@ -208,7 +208,7 @@ cmd_solink_module = $(LINK.$(TOOLSET)) -
|
||||
|
||||
LINK_COMMANDS_MAC = """\
|
||||
quiet_cmd_alink = LIBTOOL-STATIC $@
|
||||
-cmd_alink = rm -f $@ && %(python)s gyp-mac-tool filter-libtool libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %%.o,$^)
|
||||
+cmd_alink = rm -f $@ && %(python)s gyp-mac-tool filter-libtool /usr/bin/libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %%.o,$^)
|
||||
|
||||
quiet_cmd_link = LINK($(TOOLSET)) $@
|
||||
cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o "$@" $(LD_INPUTS) $(LIBS)
|
||||
@@ -0,0 +1,20 @@
|
||||
--- a/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js
|
||||
+++ b/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js
|
||||
@@ -1384,7 +1384,7 @@ const definitions = {
|
||||
},
|
||||
}),
|
||||
loglevel: new Definition('loglevel', {
|
||||
- default: 'notice',
|
||||
+ default: 'info',
|
||||
type: [
|
||||
'silent',
|
||||
'error',
|
||||
@@ -2393,7 +2393,7 @@ const definitions = {
|
||||
flatten,
|
||||
}),
|
||||
'strict-ssl': new Definition('strict-ssl', {
|
||||
- default: true,
|
||||
+ default: false,
|
||||
type: Boolean,
|
||||
description: `
|
||||
Whether or not to do SSL key validation when making requests to the
|
||||
@@ -0,0 +1,10 @@
|
||||
--- a/deps/uv/uv.gyp
|
||||
+++ b/deps/uv/uv.gyp
|
||||
@@ -155,6 +155,7 @@
|
||||
'target_name': 'libuv',
|
||||
'toolsets': ['host', 'target'],
|
||||
'type': '<(uv_library)',
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'include',
|
||||
'src/',
|
||||
@@ -0,0 +1,10 @@
|
||||
--- a/deps/zlib/zlib.gyp
|
||||
+++ b/deps/zlib/zlib.gyp
|
||||
@@ -8,6 +8,7 @@
|
||||
'use_system_zlib%': 0,
|
||||
'arm_fpu%': '',
|
||||
},
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'conditions': [
|
||||
['use_system_zlib==0', {
|
||||
'targets': [
|
||||
@@ -0,0 +1,18 @@
|
||||
--- a/node.gyp
|
||||
+++ b/node.gyp
|
||||
@@ -1222,6 +1222,7 @@
|
||||
'includes': [
|
||||
'node.gypi'
|
||||
],
|
||||
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'include_dirs': [
|
||||
'src',
|
||||
'tools/msvs/genfiles',
|
||||
@@ -1610,6 +1611,7 @@
|
||||
'target_name': 'node_js2c',
|
||||
'type': 'executable',
|
||||
'toolsets': ['host'],
|
||||
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'include_dirs': [
|
||||
'tools',
|
||||
'src',
|
||||
@@ -0,0 +1,106 @@
|
||||
--- a/tools/icu/icu-generic.gyp
|
||||
+++ b/tools/icu/icu-generic.gyp
|
||||
@@ -106,6 +106,7 @@
|
||||
'sources': [
|
||||
'<@(icu_src_i18n)'
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/i18n',
|
||||
],
|
||||
@@ -114,6 +115,7 @@
|
||||
],
|
||||
'dependencies': [ 'icuucx', 'icu_implementation', 'icu_uconfig', 'icu_uconfig_target' ],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/i18n',
|
||||
],
|
||||
@@ -224,6 +226,7 @@
|
||||
# full data - no trim needed
|
||||
'sources': [ '<(SHARED_INTERMEDIATE_DIR)/icudt<(icu_ver_major)_dat.<(icu_asm_ext)' ],
|
||||
'dependencies': [ 'genccode#host', 'icupkg#host', 'icu_implementation#host', 'icu_uconfig' ],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
],
|
||||
@@ -308,6 +311,7 @@
|
||||
# This file contains the small ICU data
|
||||
'sources': [ '<(SHARED_INTERMEDIATE_DIR)/icusmdt<(icu_ver_major)_dat.<(icu_asm_ext)' ],
|
||||
# for umachine.h
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
],
|
||||
@@ -324,6 +328,7 @@
|
||||
'sources': [
|
||||
'<@(icu_src_stubdata)'
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
],
|
||||
@@ -363,6 +368,7 @@
|
||||
'_XOPEN_SOURCE_EXTENDED=0',
|
||||
]}],
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
],
|
||||
@@ -372,6 +378,7 @@
|
||||
'cflags_c': ['-std=c99'],
|
||||
'export_dependent_settings': [ 'icu_uconfig', 'icu_uconfig_target' ],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
],
|
||||
@@ -402,6 +409,7 @@
|
||||
'<(icu_path)/source/tools/toolutil/dbgutil.cpp',
|
||||
'<(icu_path)/source/tools/toolutil/dbgutil.h',
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
'<(icu_path)/source/i18n',
|
||||
@@ -421,6 +429,7 @@
|
||||
}]
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
'<(icu_path)/source/i18n',
|
||||
@@ -442,6 +451,7 @@
|
||||
'target_name': 'genrb',
|
||||
'type': 'executable',
|
||||
'toolsets': [ 'host' ],
|
||||
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'dependencies': [ 'icutools', 'icu_implementation' ],
|
||||
'sources': [
|
||||
'<@(icu_src_genrb)'
|
||||
@@ -474,6 +484,7 @@
|
||||
'target_name': 'iculslocs',
|
||||
'toolsets': [ 'host' ],
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'dependencies': [ 'icutools' ],
|
||||
'sources': [
|
||||
'iculslocs.cc',
|
||||
@@ -502,6 +513,7 @@
|
||||
'target_name': 'icupkg',
|
||||
'toolsets': [ 'host' ],
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'dependencies': [ 'icutools' ],
|
||||
'sources': [
|
||||
'<@(icu_src_icupkg)',
|
||||
@@ -529,6 +541,7 @@
|
||||
'target_name': 'genccode',
|
||||
'toolsets': [ 'host' ],
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'dependencies': [ 'icutools' ],
|
||||
'sources': [
|
||||
'<@(icu_src_genccode)',
|
||||
@@ -0,0 +1,131 @@
|
||||
--- a/tools/v8_gypfiles/v8.gyp
|
||||
+++ b/tools/v8_gypfiles/v8.gyp
|
||||
@@ -105,6 +105,7 @@
|
||||
],
|
||||
'hard_dependency': 1,
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(SHARED_INTERMEDIATE_DIR)',
|
||||
],
|
||||
@@ -227,6 +228,7 @@
|
||||
'<@(torque_outputs_cc)',
|
||||
'<@(torque_outputs_inc)',
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(SHARED_INTERMEDIATE_DIR)',
|
||||
],
|
||||
@@ -248,6 +250,7 @@
|
||||
'sources': [
|
||||
'<(generate_bytecode_builtins_list_output)',
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(generate_bytecode_output_root)',
|
||||
'<(SHARED_INTERMEDIATE_DIR)',
|
||||
@@ -331,6 +334,7 @@
|
||||
'fp16',
|
||||
'abseil.gyp:abseil',
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(SHARED_INTERMEDIATE_DIR)',
|
||||
'<(generate_bytecode_output_root)',
|
||||
@@ -952,6 +956,7 @@
|
||||
'target_name': 'v8_compiler',
|
||||
'type': 'static_library',
|
||||
'toolsets': ['host', 'target'],
|
||||
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'dependencies': [
|
||||
'generate_bytecode_builtins_list',
|
||||
'run_torque',
|
||||
@@ -1084,6 +1089,7 @@
|
||||
],
|
||||
'includes': ['inspector.gypi'],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(generate_bytecode_output_root)',
|
||||
'<(SHARED_INTERMEDIATE_DIR)',
|
||||
@@ -1705,6 +1711,7 @@
|
||||
}],
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(V8_ROOT)/include',
|
||||
],
|
||||
@@ -1725,6 +1732,7 @@
|
||||
{
|
||||
'target_name': 'bytecode_builtins_list_generator',
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'conditions': [
|
||||
['want_separate_host_toolset', {
|
||||
'toolsets': ['host'],
|
||||
@@ -1765,6 +1773,8 @@
|
||||
{
|
||||
'target_name': 'mksnapshot',
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-L<!@(echo "$STAGING_DIR"/usr/lib)', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
+ 'libraries':[ '-L../../../../staging_dir/hostpkg/share/icu/current/lib' ],
|
||||
'dependencies': [
|
||||
'v8_base_without_compiler',
|
||||
'v8_compiler_for_mksnapshot',
|
||||
@@ -1821,6 +1831,7 @@
|
||||
{
|
||||
'target_name': 'torque',
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'dependencies': [
|
||||
'torque_base',
|
||||
'abseil.gyp:abseil',
|
||||
@@ -1875,6 +1886,7 @@
|
||||
{
|
||||
'target_name': 'torque-language-server',
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'conditions': [
|
||||
['want_separate_host_toolset', {
|
||||
'toolsets': ['host'],
|
||||
@@ -1917,6 +1929,8 @@
|
||||
{
|
||||
'target_name': 'gen-regexp-special-case',
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-L<!@(echo "$STAGING_DIR"/usr/lib)', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
+ 'libraries':[ '-L../../../../staging_dir/hostpkg/share/icu/current/lib' ],
|
||||
'dependencies': [
|
||||
'v8_libbase',
|
||||
# "build/win:default_exe_manifest",
|
||||
@@ -2169,6 +2183,7 @@
|
||||
}],
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(V8_ROOT)/include',
|
||||
],
|
||||
@@ -2310,12 +2325,14 @@
|
||||
}],
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(V8_ROOT)/third_party/zlib',
|
||||
'<(V8_ROOT)/third_party/zlib/google',
|
||||
],
|
||||
},
|
||||
'defines': [ 'ZLIB_IMPLEMENTATION' ],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(V8_ROOT)/third_party/zlib',
|
||||
'<(V8_ROOT)/third_party/zlib/google',
|
||||
@@ -2363,6 +2380,7 @@
|
||||
'variables': {
|
||||
'FP16_ROOT': '../../deps/v8/third_party/fp16',
|
||||
},
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'direct_dependent_settings': {
|
||||
'include_dirs': [
|
||||
'<(FP16_ROOT)/src/include',
|
||||
@@ -0,0 +1,23 @@
|
||||
--- a/tools/v8_gypfiles/abseil.gyp
|
||||
+++ b/tools/v8_gypfiles/abseil.gyp
|
||||
@@ -9,16 +9,20 @@
|
||||
'ABSEIL_ROOT': '../../deps/v8/third_party/abseil-cpp',
|
||||
},
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(ABSEIL_ROOT)',
|
||||
],
|
||||
+ 'include_dirs': [ '<(ABSEIL_ROOT)', '<!@(echo "$STAGING_DIR"/usr/../usr/include)' ],
|
||||
'xcode_settings': {
|
||||
'OTHER_LDFLAGS': ['-framework CoreFoundation'],
|
||||
},
|
||||
},
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(ABSEIL_ROOT)',
|
||||
],
|
||||
+ 'include_dirs': [ '<(ABSEIL_ROOT)', '<!@(echo "$STAGING_DIR"/usr/../usr/include)' ],
|
||||
'sources': [
|
||||
'<(ABSEIL_ROOT)/absl/algorithm/algorithm.h',
|
||||
'<(ABSEIL_ROOT)/absl/algorithm/container.h',
|
||||
@@ -0,0 +1,15 @@
|
||||
From: Johannes Müller <alpinelinux@jogemu.at>
|
||||
Date: Wed Aug 5 17:35:19 2026 +0000
|
||||
Subject: Deactivate AVX2 dispatch on x86 due to unsupported _mm_extract_epi64
|
||||
|
||||
--- a/deps/histogram/src/hdr_histogram.c
|
||||
+++ b/deps/histogram/src/hdr_histogram.c
|
||||
@@ -36,7 +36,7 @@
|
||||
|
||||
/* Runtime-dispatched AVX2 path: keep the rest of this TU at the project's
|
||||
baseline ISA so the shipped binary does not silently require AVX2. */
|
||||
-#if (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86)) \
|
||||
+#if (defined(__x86_64__) || defined(_M_X64)) \
|
||||
&& (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER) && !defined(_MSC_VER)
|
||||
# define HDR_HAS_AVX2_DISPATCH 1
|
||||
# include <immintrin.h>
|
||||
@@ -0,0 +1,29 @@
|
||||
Description: do not use dns.ADDRCONFIG for localhost
|
||||
it fails on IPv6-only systems. Setting it with libc fails on linux.
|
||||
https://github.com/nodejs/node/issues/33279
|
||||
Author: Jérémy Lal <kapouer@melix.org>
|
||||
Last-Update: 2020-06-11
|
||||
Bug-Debian: https://bugs.debian.org/962318
|
||||
Forwarded: https://github.com/nodejs/node/issues/33816
|
||||
--- a/lib/net.js
|
||||
+++ b/lib/net.js
|
||||
@@ -1,4 +1,5 @@
|
||||
// Copyright Joyent, Inc. and other Node contributors.
|
||||
+
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a
|
||||
// copy of this software and associated documentation files (the
|
||||
@@ -1744,13 +1745,6 @@ function lookupAndConnect(self, options)
|
||||
hints: options.hints || 0,
|
||||
};
|
||||
|
||||
- if (!isWindows &&
|
||||
- dnsopts.family !== 4 &&
|
||||
- dnsopts.family !== 6 &&
|
||||
- dnsopts.hints === 0) {
|
||||
- dnsopts.hints = dns.ADDRCONFIG;
|
||||
- }
|
||||
-
|
||||
debug('connect: find host', host);
|
||||
debug('connect: dns options', dnsopts);
|
||||
self._host = host;
|
||||
@@ -0,0 +1,10 @@
|
||||
--- a/node.gyp
|
||||
+++ b/node.gyp
|
||||
@@ -1223,6 +1223,7 @@
|
||||
'node.gypi'
|
||||
],
|
||||
'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
+ 'cflags!': ['-mbranch-protection=standard'],
|
||||
'include_dirs': [
|
||||
'src',
|
||||
'tools/msvs/genfiles',
|
||||
@@ -0,0 +1,20 @@
|
||||
--- a/deps/v8/src/compiler/turboshaft/int64-lowering-reducer.h
|
||||
+++ b/deps/v8/src/compiler/turboshaft/int64-lowering-reducer.h
|
||||
@@ -637,7 +637,7 @@ class Int64LoweringReducer : public Next
|
||||
result = __ Word32CountLeadingZeros(high);
|
||||
}
|
||||
|
||||
- return __ Tuple<Word32, Word32>(result, __ Word32Constant(0));
|
||||
+ return __ template Tuple<Word32, Word32>(result, __ Word32Constant(0));
|
||||
}
|
||||
|
||||
V<Word32Pair> LowerCtz(V<Word32Pair> input) {
|
||||
@@ -650,7 +650,7 @@ class Int64LoweringReducer : public Next
|
||||
result = __ Word32CountTrailingZeros(low);
|
||||
}
|
||||
|
||||
- return __ Tuple<Word32, Word32>(result, __ Word32Constant(0));
|
||||
+ return __ template Tuple<Word32, Word32>(result, __ Word32Constant(0));
|
||||
}
|
||||
|
||||
V<Word32Pair> LowerPopCount(V<Word32Pair> input) {
|
||||
@@ -0,0 +1,12 @@
|
||||
--- a/lib/internal/modules/cjs/loader.js
|
||||
+++ b/lib/internal/modules/cjs/loader.js
|
||||
@@ -2212,7 +2212,8 @@ Module._initPaths = function() {
|
||||
path.resolve(process.execPath, '..') :
|
||||
path.resolve(process.execPath, '..', '..');
|
||||
|
||||
- const paths = [path.resolve(prefixDir, 'lib', 'node')];
|
||||
+ const paths = [path.resolve(prefixDir, 'lib', 'node'),
|
||||
+ path.resolve(prefixDir, 'lib', 'node_modules')];
|
||||
|
||||
if (homeDir) {
|
||||
ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries'));
|
||||
@@ -0,0 +1,22 @@
|
||||
--- a/deps/v8/src/base/platform/platform-posix.cc
|
||||
+++ b/deps/v8/src/base/platform/platform-posix.cc
|
||||
@@ -1337,7 +1337,7 @@ bool Thread::Start() {
|
||||
#if V8_OS_DARWIN
|
||||
// Default on Mac OS X is 512kB -- bump up to 1MB
|
||||
stack_size = 1 * 1024 * 1024;
|
||||
-#elif V8_OS_AIX
|
||||
+#elif V8_OS_AIX || !defined(__GLIBC__)
|
||||
// Default on AIX is 96kB -- bump up to 2MB
|
||||
stack_size = 2 * 1024 * 1024;
|
||||
#endif
|
||||
--- a/deps/v8/src/codegen/external-reference-table.cc
|
||||
+++ b/deps/v8/src/codegen/external-reference-table.cc
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "src/ic/stub-cache.h"
|
||||
#include "src/logging/counters.h"
|
||||
|
||||
-#if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
|
||||
+#if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID) && defined(V8_LIBC_GLIBC)
|
||||
#define SYMBOLIZE_FUNCTION
|
||||
#include <execinfo.h>
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/tools/gyp/pylib/gyp/generator/make.py
|
||||
+++ b/tools/gyp/pylib/gyp/generator/make.py
|
||||
@@ -208,7 +208,7 @@ cmd_solink_module = $(LINK.$(TOOLSET)) -
|
||||
|
||||
LINK_COMMANDS_MAC = """\
|
||||
quiet_cmd_alink = LIBTOOL-STATIC $@
|
||||
-cmd_alink = rm -f $@ && %(python)s gyp-mac-tool filter-libtool libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %%.o,$^)
|
||||
+cmd_alink = rm -f $@ && %(python)s gyp-mac-tool filter-libtool /usr/bin/libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %%.o,$^)
|
||||
|
||||
quiet_cmd_link = LINK($(TOOLSET)) $@
|
||||
cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o "$@" $(LD_INPUTS) $(LIBS)
|
||||
@@ -0,0 +1,20 @@
|
||||
--- a/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js
|
||||
+++ b/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js
|
||||
@@ -1384,7 +1384,7 @@ const definitions = {
|
||||
},
|
||||
}),
|
||||
loglevel: new Definition('loglevel', {
|
||||
- default: 'notice',
|
||||
+ default: 'info',
|
||||
type: [
|
||||
'silent',
|
||||
'error',
|
||||
@@ -2393,7 +2393,7 @@ const definitions = {
|
||||
flatten,
|
||||
}),
|
||||
'strict-ssl': new Definition('strict-ssl', {
|
||||
- default: true,
|
||||
+ default: false,
|
||||
type: Boolean,
|
||||
description: `
|
||||
Whether or not to do SSL key validation when making requests to the
|
||||
@@ -0,0 +1,10 @@
|
||||
--- a/deps/uv/uv.gyp
|
||||
+++ b/deps/uv/uv.gyp
|
||||
@@ -155,6 +155,7 @@
|
||||
'target_name': 'libuv',
|
||||
'toolsets': ['host', 'target'],
|
||||
'type': '<(uv_library)',
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'include',
|
||||
'src/',
|
||||
@@ -0,0 +1,10 @@
|
||||
--- a/deps/zlib/zlib.gyp
|
||||
+++ b/deps/zlib/zlib.gyp
|
||||
@@ -8,6 +8,7 @@
|
||||
'use_system_zlib%': 0,
|
||||
'arm_fpu%': '',
|
||||
},
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'conditions': [
|
||||
['use_system_zlib==0', {
|
||||
'targets': [
|
||||
@@ -0,0 +1,18 @@
|
||||
--- a/node.gyp
|
||||
+++ b/node.gyp
|
||||
@@ -1243,6 +1243,7 @@
|
||||
'includes': [
|
||||
'node.gypi'
|
||||
],
|
||||
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'include_dirs': [
|
||||
'src',
|
||||
'tools/msvs/genfiles',
|
||||
@@ -1635,6 +1636,7 @@
|
||||
'target_name': 'node_js2c',
|
||||
'type': 'executable',
|
||||
'toolsets': ['host'],
|
||||
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'include_dirs': [
|
||||
'tools',
|
||||
'src',
|
||||
@@ -0,0 +1,106 @@
|
||||
--- a/tools/icu/icu-generic.gyp
|
||||
+++ b/tools/icu/icu-generic.gyp
|
||||
@@ -106,6 +106,7 @@
|
||||
'sources': [
|
||||
'<@(icu_src_i18n)'
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/i18n',
|
||||
],
|
||||
@@ -114,6 +115,7 @@
|
||||
],
|
||||
'dependencies': [ 'icuucx', 'icu_implementation', 'icu_uconfig', 'icu_uconfig_target' ],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/i18n',
|
||||
],
|
||||
@@ -224,6 +226,7 @@
|
||||
# full data - no trim needed
|
||||
'sources': [ '<(SHARED_INTERMEDIATE_DIR)/icudt<(icu_ver_major)_dat.<(icu_asm_ext)' ],
|
||||
'dependencies': [ 'genccode#host', 'icupkg#host', 'icu_implementation#host', 'icu_uconfig' ],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
],
|
||||
@@ -308,6 +311,7 @@
|
||||
# This file contains the small ICU data
|
||||
'sources': [ '<(SHARED_INTERMEDIATE_DIR)/icusmdt<(icu_ver_major)_dat.<(icu_asm_ext)' ],
|
||||
# for umachine.h
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
],
|
||||
@@ -324,6 +328,7 @@
|
||||
'sources': [
|
||||
'<@(icu_src_stubdata)'
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
],
|
||||
@@ -363,6 +368,7 @@
|
||||
'_XOPEN_SOURCE_EXTENDED=0',
|
||||
]}],
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
],
|
||||
@@ -372,6 +378,7 @@
|
||||
'cflags_c': ['-std=c99'],
|
||||
'export_dependent_settings': [ 'icu_uconfig', 'icu_uconfig_target' ],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
],
|
||||
@@ -402,6 +409,7 @@
|
||||
'<(icu_path)/source/tools/toolutil/dbgutil.cpp',
|
||||
'<(icu_path)/source/tools/toolutil/dbgutil.h',
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
'<(icu_path)/source/i18n',
|
||||
@@ -421,6 +429,7 @@
|
||||
}]
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(icu_path)/source/common',
|
||||
'<(icu_path)/source/i18n',
|
||||
@@ -442,6 +451,7 @@
|
||||
'target_name': 'genrb',
|
||||
'type': 'executable',
|
||||
'toolsets': [ 'host' ],
|
||||
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'dependencies': [ 'icutools', 'icu_implementation' ],
|
||||
'sources': [
|
||||
'<@(icu_src_genrb)'
|
||||
@@ -474,6 +484,7 @@
|
||||
'target_name': 'iculslocs',
|
||||
'toolsets': [ 'host' ],
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'dependencies': [ 'icutools' ],
|
||||
'sources': [
|
||||
'iculslocs.cc',
|
||||
@@ -502,6 +513,7 @@
|
||||
'target_name': 'icupkg',
|
||||
'toolsets': [ 'host' ],
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'dependencies': [ 'icutools' ],
|
||||
'sources': [
|
||||
'<@(icu_src_icupkg)',
|
||||
@@ -529,6 +541,7 @@
|
||||
'target_name': 'genccode',
|
||||
'toolsets': [ 'host' ],
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'dependencies': [ 'icutools' ],
|
||||
'sources': [
|
||||
'<@(icu_src_genccode)',
|
||||
@@ -0,0 +1,131 @@
|
||||
--- a/tools/v8_gypfiles/v8.gyp
|
||||
+++ b/tools/v8_gypfiles/v8.gyp
|
||||
@@ -113,6 +113,7 @@
|
||||
],
|
||||
'hard_dependency': 1,
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(SHARED_INTERMEDIATE_DIR)',
|
||||
],
|
||||
@@ -235,6 +236,7 @@
|
||||
'<@(torque_outputs_cc)',
|
||||
'<@(torque_outputs_inc)',
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(SHARED_INTERMEDIATE_DIR)',
|
||||
],
|
||||
@@ -256,6 +258,7 @@
|
||||
'sources': [
|
||||
'<(generate_bytecode_builtins_list_output)',
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(generate_bytecode_output_root)',
|
||||
'<(SHARED_INTERMEDIATE_DIR)',
|
||||
@@ -315,6 +318,7 @@
|
||||
'v8_shared_internal_headers',
|
||||
'v8_pch',
|
||||
],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(SHARED_INTERMEDIATE_DIR)',
|
||||
'<(generate_bytecode_output_root)',
|
||||
@@ -987,6 +991,7 @@
|
||||
'target_name': 'v8_compiler',
|
||||
'type': 'static_library',
|
||||
'toolsets': ['host', 'target'],
|
||||
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'dependencies': [
|
||||
'generate_bytecode_builtins_list',
|
||||
'run_torque',
|
||||
@@ -1122,6 +1127,7 @@
|
||||
],
|
||||
'includes': ['inspector.gypi'],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(generate_bytecode_output_root)',
|
||||
'<(SHARED_INTERMEDIATE_DIR)',
|
||||
@@ -1794,6 +1800,7 @@
|
||||
}],
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(V8_ROOT)/include',
|
||||
],
|
||||
@@ -1814,6 +1821,7 @@
|
||||
{
|
||||
'target_name': 'bytecode_builtins_list_generator',
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'conditions': [
|
||||
['want_separate_host_toolset', {
|
||||
'toolsets': ['host'],
|
||||
@@ -1856,6 +1864,8 @@
|
||||
{
|
||||
'target_name': 'mksnapshot',
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-L<!@(echo "$STAGING_DIR"/usr/lib)', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
+ 'libraries':[ '-L../../../../staging_dir/hostpkg/share/icu/current/lib' ],
|
||||
'dependencies': [
|
||||
'v8_base_without_compiler',
|
||||
'v8_compiler_for_mksnapshot',
|
||||
@@ -1918,6 +1928,7 @@
|
||||
{
|
||||
'target_name': 'torque',
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'dependencies': [
|
||||
'torque_base',
|
||||
# "build/win:default_exe_manifest",
|
||||
@@ -1974,6 +1985,7 @@
|
||||
{
|
||||
'target_name': 'torque-language-server',
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
'conditions': [
|
||||
['want_separate_host_toolset', {
|
||||
'toolsets': ['host'],
|
||||
@@ -2016,6 +2028,8 @@
|
||||
{
|
||||
'target_name': 'gen-regexp-special-case',
|
||||
'type': 'executable',
|
||||
+ 'libraries!':[ '-L<!@(echo "$STAGING_DIR"/usr/lib)', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
+ 'libraries':[ '-L../../../../staging_dir/hostpkg/share/icu/current/lib' ],
|
||||
'dependencies': [
|
||||
'v8_libbase',
|
||||
# "build/win:default_exe_manifest",
|
||||
@@ -2277,6 +2291,7 @@
|
||||
}],
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(V8_ROOT)/include',
|
||||
],
|
||||
@@ -2420,12 +2435,14 @@
|
||||
}],
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(V8_ROOT)/third_party/zlib',
|
||||
'<(V8_ROOT)/third_party/zlib/google',
|
||||
],
|
||||
},
|
||||
'defines': [ 'ZLIB_IMPLEMENTATION' ],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(V8_ROOT)/third_party/zlib',
|
||||
'<(V8_ROOT)/third_party/zlib/google',
|
||||
@@ -2473,6 +2490,7 @@
|
||||
'variables': {
|
||||
'FP16_ROOT': '../../deps/v8/third_party/fp16',
|
||||
},
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'all_dependent_settings': {
|
||||
'include_dirs': [
|
||||
'<(FP16_ROOT)/src/include',
|
||||
@@ -0,0 +1,23 @@
|
||||
--- a/tools/v8_gypfiles/abseil.gyp
|
||||
+++ b/tools/v8_gypfiles/abseil.gyp
|
||||
@@ -9,16 +9,20 @@
|
||||
'ABSEIL_ROOT': '../../deps/v8/third_party/abseil-cpp',
|
||||
},
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(ABSEIL_ROOT)',
|
||||
],
|
||||
+ 'include_dirs': [ '<(ABSEIL_ROOT)', '<!@(echo "$STAGING_DIR"/usr/../usr/include)' ],
|
||||
'xcode_settings': {
|
||||
'OTHER_LDFLAGS': ['-framework CoreFoundation'],
|
||||
},
|
||||
},
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'<(ABSEIL_ROOT)',
|
||||
],
|
||||
+ 'include_dirs': [ '<(ABSEIL_ROOT)', '<!@(echo "$STAGING_DIR"/usr/../usr/include)' ],
|
||||
'sources': [
|
||||
'<(ABSEIL_ROOT)/absl/algorithm/algorithm.h',
|
||||
'<(ABSEIL_ROOT)/absl/algorithm/container.h',
|
||||
@@ -0,0 +1,18 @@
|
||||
--- a/deps/LIEF/lief.gyp
|
||||
+++ b/deps/LIEF/lief.gyp
|
||||
@@ -419,6 +419,7 @@
|
||||
'toolsets': ['host', 'target'],
|
||||
'type': 'static_library',
|
||||
'includes': [],
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [
|
||||
'.',
|
||||
#include <LIEF/third-party/internal/expected.hpp>
|
||||
@@ -439,6 +440,7 @@
|
||||
"include/LIEF/third-party/internal",
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||
'include_dirs': [ 'include' ],
|
||||
},
|
||||
'defines': [
|
||||
@@ -0,0 +1,15 @@
|
||||
From: Johannes Müller <alpinelinux@jogemu.at>
|
||||
Date: Wed Aug 5 17:35:19 2026 +0000
|
||||
Subject: Deactivate AVX2 dispatch on x86 due to unsupported _mm_extract_epi64
|
||||
|
||||
--- a/deps/histogram/src/hdr_histogram.c
|
||||
+++ b/deps/histogram/src/hdr_histogram.c
|
||||
@@ -36,7 +36,7 @@
|
||||
|
||||
/* Runtime-dispatched AVX2 path: keep the rest of this TU at the project's
|
||||
baseline ISA so the shipped binary does not silently require AVX2. */
|
||||
-#if (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86)) \
|
||||
+#if (defined(__x86_64__) || defined(_M_X64)) \
|
||||
&& (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER) && !defined(_MSC_VER)
|
||||
# define HDR_HAS_AVX2_DISPATCH 1
|
||||
# include <immintrin.h>
|
||||
@@ -0,0 +1,29 @@
|
||||
Description: do not use dns.ADDRCONFIG for localhost
|
||||
it fails on IPv6-only systems. Setting it with libc fails on linux.
|
||||
https://github.com/nodejs/node/issues/33279
|
||||
Author: Jérémy Lal <kapouer@melix.org>
|
||||
Last-Update: 2020-06-11
|
||||
Bug-Debian: https://bugs.debian.org/962318
|
||||
Forwarded: https://github.com/nodejs/node/issues/33816
|
||||
--- a/lib/net.js
|
||||
+++ b/lib/net.js
|
||||
@@ -1,4 +1,5 @@
|
||||
// Copyright Joyent, Inc. and other Node contributors.
|
||||
+
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a
|
||||
// copy of this software and associated documentation files (the
|
||||
@@ -1744,13 +1745,6 @@ function lookupAndConnect(self, options)
|
||||
hints: options.hints || 0,
|
||||
};
|
||||
|
||||
- if (!isWindows &&
|
||||
- dnsopts.family !== 4 &&
|
||||
- dnsopts.family !== 6 &&
|
||||
- dnsopts.hints === 0) {
|
||||
- dnsopts.hints = dns.ADDRCONFIG;
|
||||
- }
|
||||
-
|
||||
debug('connect: find host', host);
|
||||
debug('connect: dns options', dnsopts);
|
||||
self._host = host;
|
||||
@@ -0,0 +1,10 @@
|
||||
--- a/node.gyp
|
||||
+++ b/node.gyp
|
||||
@@ -1244,6 +1244,7 @@
|
||||
'node.gypi'
|
||||
],
|
||||
'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||
+ 'cflags!': ['-mbranch-protection=standard'],
|
||||
'include_dirs': [
|
||||
'src',
|
||||
'tools/msvs/genfiles',
|
||||
@@ -0,0 +1,26 @@
|
||||
From: Johannes Müller <alpinelinux@jogemu.at>
|
||||
Date: Wed May 6 19:56:53 2025 +0000
|
||||
Subject: Allow less highway lanes to fix armhf build
|
||||
|
||||
--- a/deps/v8/src/strings/string-hasher.cc
|
||||
+++ b/deps/v8/src/strings/string-hasher.cc
|
||||
@@ -77,7 +77,7 @@ uint64_t HashConvertingTo8Bit(const uint
|
||||
|
||||
bool IsOnly8BitSIMD(const uint16_t* chars, unsigned len) {
|
||||
namespace hw = hwy::HWY_NAMESPACE;
|
||||
- hw::FixedTag<uint16_t, 8> tag;
|
||||
+ hw::CappedTag<uint16_t, 8> tag;
|
||||
const size_t stride = hw::Lanes(tag);
|
||||
const auto high_byte_mask = hw::Set(tag, static_cast<uint16_t>(0xFF00));
|
||||
const auto zero = hw::Zero(tag);
|
||||
--- a/deps/v8/src/json/json-stringifier.cc
|
||||
+++ b/deps/v8/src/json/json-stringifier.cc
|
||||
@@ -3398,7 +3398,7 @@ bool FastJsonStringifier<Char>::AppendSt
|
||||
size_t uncopied_src_index = 0; // Index of first char not copied yet.
|
||||
const SrcChar* block = chars;
|
||||
const SrcChar* end = chars + length;
|
||||
- hw::FixedTag<SrcChar, 16> tag;
|
||||
+ hw::CappedTag<SrcChar, 16> tag;
|
||||
static const size_t stride = hw::Lanes(tag);
|
||||
|
||||
const auto mask_0x20 = hw::Set(tag, 0x20);
|
||||
@@ -0,0 +1,24 @@
|
||||
Patch source: https://github.com/felixonmars/archriscv-packages/commit/c892e1fff21f427b5753b5d9cd8defb6b14763dd
|
||||
|
||||
Disable v8's trap handler[1] to workaround ENOMEM on sv39 systems[2].
|
||||
v8's OOB trap handler for wasm tries to allocate a 10 GB guard region[3],
|
||||
but unfortunately on sv39 systems we only have 256GB virtual memory for
|
||||
userspace, which is usually already exhausted by the node process and
|
||||
leads to `WebAssembly.Instance(): Out of memory: Cannot allocate Wasm
|
||||
memory for new instance` errors
|
||||
|
||||
[1]: https://chromium-review.googlesource.com/c/v8/v8/+/5227604
|
||||
[2]: https://github.com/riscv-forks/electron/issues/3#issuecomment-2391689815
|
||||
[3]: https://github.com/nodejs/node/blob/09a8440b45f69651ff52110cb1bc2dde9e14e2e8/deps/v8/src/objects/backing-store.cc#L38
|
||||
|
||||
--- a/deps/v8/src/trap-handler/trap-handler.h
|
||||
+++ b/deps/v8/src/trap-handler/trap-handler.h
|
||||
@@ -49,7 +49,7 @@ namespace v8::internal::trap_handler {
|
||||
// RISCV64 (non-simulator) on Linux.
|
||||
#elif V8_TARGET_ARCH_RISCV64 && V8_HOST_ARCH_RISCV64 && V8_OS_LINUX && \
|
||||
!V8_OS_ANDROID
|
||||
-#define V8_TRAP_HANDLER_SUPPORTED true
|
||||
+#define V8_TRAP_HANDLER_SUPPORTED false
|
||||
// RISCV64 simulator on x64 on Linux
|
||||
#elif V8_TARGET_ARCH_RISCV64 && V8_HOST_ARCH_X64 && V8_OS_LINUX
|
||||
#define V8_TRAP_HANDLER_VIA_SIMULATOR
|
||||
@@ -0,0 +1,24 @@
|
||||
From: Johannes Müller <alpinelinux@jogemu.at>
|
||||
Date: Fri Jul 12 11:33:42 2026 +0000
|
||||
Subject: Resolve undefined reference to FloatMinMaxHelper
|
||||
|
||||
--- a/deps/v8/src/maglev/riscv/maglev-ir-riscv.cc
|
||||
+++ b/deps/v8/src/maglev/riscv/maglev-ir-riscv.cc
|
||||
@@ -881,7 +881,7 @@ void Float64Min::GenerateCode(MaglevAsse
|
||||
DoubleRegister right = ToDoubleRegister(RightInput());
|
||||
DoubleRegister out = ToDoubleRegister(result());
|
||||
|
||||
- __ FloatMinMaxHelper<double>(out, left, right, MaxMinKind::kMin);
|
||||
+ __ Float64Min(out, left, right);
|
||||
}
|
||||
|
||||
void Float64Max::SetValueLocationConstraints() {
|
||||
@@ -896,7 +896,7 @@ void Float64Max::GenerateCode(MaglevAsse
|
||||
DoubleRegister right = ToDoubleRegister(RightInput());
|
||||
DoubleRegister out = ToDoubleRegister(result());
|
||||
|
||||
- __ FloatMinMaxHelper<double>(out, left, right, MaxMinKind::kMax);
|
||||
+ __ Float64Max(out, left, right);
|
||||
}
|
||||
|
||||
int Float64Ieee754Unary::MaxCallStackArgs() const { return 0; }
|
||||
@@ -0,0 +1,114 @@
|
||||
From: Martijn van der Ven <martijn@vanderven.se>
|
||||
Date: Thu Aug 20 09:37:04 2026 +0000
|
||||
Subject: Enable Temporal with system ICU via baked zoneinfo64 data
|
||||
|
||||
V8 loads Temporal's timezone data through the ICU-internal udatamem.h
|
||||
API, which system ICU does not provide, so configuring with
|
||||
--with-intl=system-icu leaves Temporal disabled. Always use the baked
|
||||
zoneinfo64 data path that V8 already uses for builds without intl
|
||||
instead; the zoneinfo64.res input is vendored in the release tarball
|
||||
as part of the zoneinfo64 crate.
|
||||
|
||||
Patch-Source: https://github.com/nodejs/node/pull/62766
|
||||
--- a/deps/v8/src/objects/js-temporal-zoneinfo64.h
|
||||
+++ b/deps/v8/src/objects/js-temporal-zoneinfo64.h
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#include "temporal_rs/Provider.d.hpp"
|
||||
|
||||
-#ifdef V8_INTL_SUPPORT
|
||||
+#if false
|
||||
#include "unicode/udata.h"
|
||||
#else
|
||||
#include <vector>
|
||||
@@ -37,7 +37,7 @@ class ZoneInfo64Provider {
|
||||
ZoneInfo64Provider();
|
||||
~ZoneInfo64Provider();
|
||||
std::unique_ptr<temporal_rs::Provider> provider;
|
||||
-#ifdef V8_INTL_SUPPORT
|
||||
+#if false
|
||||
UDataMemory* memory;
|
||||
#endif
|
||||
};
|
||||
--- a/deps/v8/src/objects/js-temporal-zoneinfo64.cc
|
||||
+++ b/deps/v8/src/objects/js-temporal-zoneinfo64.cc
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "temporal_rs/Provider.hpp"
|
||||
#include "temporal_rs/TimeZone.hpp"
|
||||
|
||||
-#ifdef V8_INTL_SUPPORT
|
||||
+#if false
|
||||
#include "udatamem.h"
|
||||
#else
|
||||
// Defined in builtins-temporal-zoneinfo64-data.cc, generated by
|
||||
@@ -22,7 +22,7 @@ extern "C" size_t zoneinfo64_static_data
|
||||
namespace v8::internal {
|
||||
|
||||
ZoneInfo64Provider::ZoneInfo64Provider() {
|
||||
-#ifdef V8_INTL_SUPPORT
|
||||
+#if false
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
memory = udata_open(0, "res", "zoneinfo64", &status);
|
||||
if (U_FAILURE(status)) {
|
||||
@@ -74,7 +74,7 @@ ZoneInfo64Provider::~ZoneInfo64Provider(
|
||||
|
||||
// Then clean up memory
|
||||
// This ideally is a no-op when using static data
|
||||
-#ifdef V8_INTL_SUPPORT
|
||||
+#if false
|
||||
if (memory) {
|
||||
udata_close(memory);
|
||||
}
|
||||
--- a/tools/v8_gypfiles/v8.gyp
|
||||
+++ b/tools/v8_gypfiles/v8.gyp
|
||||
@@ -1159,6 +1159,9 @@
|
||||
],
|
||||
}],
|
||||
['v8_enable_temporal_support==1', {
|
||||
+ 'dependencies': [
|
||||
+ 'make_temporal_zoneinfo_cpp',
|
||||
+ ],
|
||||
'conditions': [
|
||||
['node_shared_temporal_capi=="false"', {
|
||||
'dependencies': [
|
||||
@@ -2063,6 +2066,40 @@
|
||||
],
|
||||
}, # gen-regexp-special-case
|
||||
{
|
||||
+ 'target_name': 'make_temporal_zoneinfo_cpp',
|
||||
+ 'type': 'none',
|
||||
+ 'toolsets': ['host', 'target'],
|
||||
+ 'conditions': [
|
||||
+ ['v8_enable_temporal_support==1', {
|
||||
+ 'actions': [
|
||||
+ {
|
||||
+ 'action_name': 'make_temporal_zoneinfo_cpp_action',
|
||||
+ 'inputs': [
|
||||
+ '<(V8_ROOT)/tools/include-file-as-bytes.py',
|
||||
+ '<(V8_ROOT)/../crates/vendor/zoneinfo64-v0_3/src/data/zoneinfo64.res',
|
||||
+ ],
|
||||
+ 'outputs': [
|
||||
+ '<(SHARED_INTERMEDIATE_DIR)/src/builtins/builtins-temporal-zoneinfo64-data.cc',
|
||||
+ ],
|
||||
+ 'action': [
|
||||
+ '<(python)',
|
||||
+ '<(V8_ROOT)/tools/include-file-as-bytes.py',
|
||||
+ '<(V8_ROOT)/../crates/vendor/zoneinfo64-v0_3/src/data/zoneinfo64.res',
|
||||
+ '<@(_outputs)',
|
||||
+ 'zoneinfo64_static_data',
|
||||
+ ],
|
||||
+ 'message': 'Generating temporal zoneinfo static data',
|
||||
+ },
|
||||
+ ],
|
||||
+ }],
|
||||
+ ],
|
||||
+ 'direct_dependent_settings': {
|
||||
+ 'sources': [
|
||||
+ '<(SHARED_INTERMEDIATE_DIR)/src/builtins/builtins-temporal-zoneinfo64-data.cc',
|
||||
+ ],
|
||||
+ },
|
||||
+ }, # make_temporal_zoneinfo_cpp
|
||||
+ {
|
||||
'target_name': 'run_gen-regexp-special-case',
|
||||
'type': 'none',
|
||||
'toolsets': ['host', 'target'],
|
||||
@@ -0,0 +1,24 @@
|
||||
From: Johannes Müller <50362-jogemu@users.gitlab.alpinelinux.org>
|
||||
Date: Fri Oct 31 07:00:11 2025 +0000
|
||||
Subject: Fix x86 build because _mm_cvtsi128_si64 is x64 only
|
||||
|
||||
--- a/deps/v8/src/strings/string-hasher.cc
|
||||
+++ b/deps/v8/src/strings/string-hasher.cc
|
||||
@@ -24,7 +24,7 @@ struct ConvertTo8BitHashReader {
|
||||
DCHECK_LE(p[5], 0xff);
|
||||
DCHECK_LE(p[6], 0xff);
|
||||
DCHECK_LE(p[7], 0xff);
|
||||
-#ifdef __SSE2__
|
||||
+#if defined(__SSE2__) && defined(__x86_64__)
|
||||
__m128i x = _mm_loadu_si128(reinterpret_cast<const __m128i*>(p));
|
||||
return _mm_cvtsi128_si64(_mm_packus_epi16(x, x));
|
||||
#elif defined(__ARM_NEON__)
|
||||
@@ -45,7 +45,7 @@ struct ConvertTo8BitHashReader {
|
||||
DCHECK_LE(p[1], 0xff);
|
||||
DCHECK_LE(p[2], 0xff);
|
||||
DCHECK_LE(p[3], 0xff);
|
||||
-#ifdef __SSE2__
|
||||
+#if defined(__SSE2__) && defined(__x86_64__)
|
||||
__m128i x = _mm_loadu_si64(reinterpret_cast<const __m128i*>(p));
|
||||
return _mm_cvtsi128_si64(_mm_packus_epi16(x, x));
|
||||
#elif defined(__ARM_NEON__)
|
||||
@@ -0,0 +1,16 @@
|
||||
[arm64] Use the ISB instruction instead of YIELD
|
||||
https://source.chromium.org/chromium/_/chromium/v8/v8/+/2b4f16e81707a744c09417f49ad6c7cb77413da8
|
||||
--- a/deps/v8/src/base/platform/yield-processor.h
|
||||
+++ b/deps/v8/src/base/platform/yield-processor.h
|
||||
@@ -41,8 +41,10 @@
|
||||
#if defined(V8_HOST_ARCH_IA32) || defined(V8_HOST_ARCH_X64)
|
||||
#define YIELD_PROCESSOR __asm__ __volatile__("pause")
|
||||
#elif defined(V8_HOST_ARCH_ARM64) || \
|
||||
- (defined(V8_HOST_ARCH_ARM) && __ARM_ARCH >= 6)
|
||||
+ (defined(V8_HOST_ARCH_ARM) && __ARM_ARCH > 6)
|
||||
#define YIELD_PROCESSOR __asm__ __volatile__("isb" ::: "memory")
|
||||
+#elif defined(V8_HOST_ARCH_ARM)
|
||||
+#define YIELD_PROCESSOR __asm__ __volatile__("yield")
|
||||
#elif defined(V8_HOST_ARCH_MIPS64EL) && __mips_isa_rev >= 2
|
||||
// Don't bother doing using .word here since r2 is the lowest supported mips64
|
||||
// that Chromium supports.
|
||||
Executable
+3
@@ -0,0 +1,3 @@
|
||||
#!/bin/sh
|
||||
|
||||
node -pe 'process.version' | grep "$2"
|
||||
Reference in new issue
Block a user