diff options
Diffstat (limited to 'www/node22/files')
14 files changed, 193 insertions, 0 deletions
diff --git a/www/node22/files/patch-common.gypi b/www/node22/files/patch-common.gypi new file mode 100644 index 000000000000..c1a1298912e1 --- /dev/null +++ b/www/node22/files/patch-common.gypi @@ -0,0 +1,20 @@ +--- common.gypi.orig 2023-07-20 18:27:37 UTC ++++ common.gypi +@@ -426,7 +426,7 @@ + 'ldflags': [ '-m32' ], + }], + [ 'host_arch=="ppc64" and OS not in "aix os400"', { +- 'cflags': [ '-m64', '-mminimal-toc' ], ++ 'cflags': [ '-m64' ], + 'ldflags': [ '-m64' ], + }], + [ 'host_arch=="s390x" and OS=="linux"', { +@@ -450,7 +450,7 @@ + 'ldflags': [ '-m32' ], + }], + [ 'target_arch=="ppc64" and OS not in "aix os400"', { +- 'cflags': [ '-m64', '-mminimal-toc' ], ++ 'cflags': [ '-m64' ], + 'ldflags': [ '-m64' ], + }], + [ 'target_arch=="s390x" and OS=="linux"', { diff --git a/www/node22/files/patch-deps-openssl-config-archs-linux-elf-no-asm-openssl-cl.gypi b/www/node22/files/patch-deps-openssl-config-archs-linux-elf-no-asm-openssl-cl.gypi new file mode 100644 index 000000000000..281de6be8ee2 --- /dev/null +++ b/www/node22/files/patch-deps-openssl-config-archs-linux-elf-no-asm-openssl-cl.gypi @@ -0,0 +1,11 @@ +--- deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi.orig 2023-05-16 06:58:19 UTC ++++ deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi +@@ -13,7 +13,7 @@ + '-Wall -O3 -fomit-frame-pointer', + ], + 'openssl_ex_libs_linux-elf': [ +- '-ldl -pthread', ++ '-pthread', + ], + 'openssl_cli_srcs_linux-elf': [ + 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/www/node22/files/patch-deps-openssl-config-archs-linux-elf-no-asm-openssl.gypi b/www/node22/files/patch-deps-openssl-config-archs-linux-elf-no-asm-openssl.gypi new file mode 100644 index 000000000000..5a7ce627e099 --- /dev/null +++ b/www/node22/files/patch-deps-openssl-config-archs-linux-elf-no-asm-openssl.gypi @@ -0,0 +1,11 @@ +--- deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi.orig 2023-05-16 06:58:19 UTC ++++ deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi +@@ -977,7 +977,7 @@ + '-Wall -O3 -fomit-frame-pointer', + ], + 'openssl_ex_libs_linux-elf': [ +- '-ldl -pthread', ++ '-pthread', + ], + }, + 'include_dirs': [ diff --git a/www/node22/files/patch-deps-openssl-openssl-cl_no_asm.gypi b/www/node22/files/patch-deps-openssl-openssl-cl_no_asm.gypi new file mode 100644 index 000000000000..2670843ea933 --- /dev/null +++ b/www/node22/files/patch-deps-openssl-openssl-cl_no_asm.gypi @@ -0,0 +1,17 @@ +--- deps/openssl/openssl-cl_no_asm.gypi.orig 2023-10-24 10:04:40 UTC ++++ deps/openssl/openssl-cl_no_asm.gypi +@@ -1,4 +1,5 @@ + { ++ 'defines': ['OPENSSL_NO_ASM'], + 'conditions': [ + ['target_arch=="ppc64" and OS in ("aix", "os400")', { + 'includes': ['config/archs/aix64-gcc-as/no-asm/openssl-cl.gypi'], +@@ -45,7 +46,7 @@ + 'includes': ['config/archs/linux64-loongarch64/no-asm/openssl-cl.gypi'], + }, { + # Other architectures don't use assembly +- 'includes': ['config/archs/linux-x86_64/no-asm/openssl-cl.gypi'], ++ 'includes': ['config/archs/linux-elf/no-asm/openssl-cl.gypi'], + }], + ], + } diff --git a/www/node22/files/patch-deps-openssl-openssl_no_asm.gypi b/www/node22/files/patch-deps-openssl-openssl_no_asm.gypi new file mode 100644 index 000000000000..f7fb266e350c --- /dev/null +++ b/www/node22/files/patch-deps-openssl-openssl_no_asm.gypi @@ -0,0 +1,11 @@ +--- deps/openssl/openssl_no_asm.gypi.orig 2023-05-16 06:58:20 UTC ++++ deps/openssl/openssl_no_asm.gypi +@@ -44,7 +44,7 @@ + 'includes': ['config/archs/linux64-riscv64/no-asm/openssl.gypi'], + }, { + # Other architectures don't use assembly +- 'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'], ++ 'includes': ['config/archs/linux-elf/no-asm/openssl.gypi'], + }], + ], + } diff --git a/www/node22/files/patch-deps-v8-src-base-platform-platform-freebsd.cc b/www/node22/files/patch-deps-v8-src-base-platform-platform-freebsd.cc new file mode 100644 index 000000000000..be89ded1df8d --- /dev/null +++ b/www/node22/files/patch-deps-v8-src-base-platform-platform-freebsd.cc @@ -0,0 +1,13 @@ +--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2023-05-16 06:58:20 UTC ++++ deps/v8/src/base/platform/platform-freebsd.cc +@@ -82,8 +82,8 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib + lib_name = std::string(path); + } + result.push_back(SharedLibraryAddress( +- lib_name, reinterpret_cast<uintptr_t>(map->kve_start), +- reinterpret_cast<uintptr_t>(map->kve_end))); ++ lib_name, static_cast<uintptr_t>(map->kve_start), ++ static_cast<uintptr_t>(map->kve_end))); + } + + start += ssize; diff --git a/www/node22/files/patch-deps-v8-src-base-small-vector.h b/www/node22/files/patch-deps-v8-src-base-small-vector.h new file mode 100644 index 000000000000..7e362808330c --- /dev/null +++ b/www/node22/files/patch-deps-v8-src-base-small-vector.h @@ -0,0 +1,10 @@ +--- deps/v8/src/base/small-vector.h.orig 2024-04-24 14:03:50 UTC ++++ deps/v8/src/base/small-vector.h +@@ -22,7 +22,6 @@ class SmallVector { + 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: diff --git a/www/node22/files/patch-deps-v8-src-codegen-arm-cpu-arm.cc b/www/node22/files/patch-deps-v8-src-codegen-arm-cpu-arm.cc new file mode 100644 index 000000000000..42fd70bfd7ca --- /dev/null +++ b/www/node22/files/patch-deps-v8-src-codegen-arm-cpu-arm.cc @@ -0,0 +1,18 @@ +--- deps/v8/src/codegen/arm/cpu-arm.cc.orig 2023-05-16 06:58:20 UTC ++++ deps/v8/src/codegen/arm/cpu-arm.cc +@@ -2,12 +2,15 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include "include/v8config.h" ++ + // CPU specific code for arm independent of OS goes here. + #ifdef __arm__ + #ifdef __QNXNTO__ + #include <sys/mman.h> // for cache flushing. + #undef MAP_TYPE + #elif V8_OS_FREEBSD ++#include <sys/cdefs.h> + #include <machine/sysarch.h> // for cache flushing + #include <sys/types.h> + #elif V8_OS_STARBOARD diff --git a/www/node22/files/patch-deps-v8-src-codegen-ppc-constants-ppc.h b/www/node22/files/patch-deps-v8-src-codegen-ppc-constants-ppc.h new file mode 100644 index 000000000000..c6269ea752d6 --- /dev/null +++ b/www/node22/files/patch-deps-v8-src-codegen-ppc-constants-ppc.h @@ -0,0 +1,20 @@ +--- deps/v8/src/codegen/ppc/constants-ppc.h.orig 2023-05-16 06:58:20 UTC ++++ deps/v8/src/codegen/ppc/constants-ppc.h +@@ -36,7 +36,7 @@ + #endif + + #if !(V8_HOST_ARCH_PPC || V8_HOST_ARCH_PPC64) || !V8_TARGET_ARCH_PPC64 || \ +- V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2) ++ (defined(_CALL_ELF) && _CALL_ELF == 2) + #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1 + #else + #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0 +@@ -44,7 +44,7 @@ + + #if !(V8_HOST_ARCH_PPC || V8_HOST_ARCH_PPC64) || \ + (V8_TARGET_ARCH_PPC64 && \ +- (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))) ++ (defined(_CALL_ELF) && _CALL_ELF == 2)) + #define ABI_CALL_VIA_IP 1 + #else + #define ABI_CALL_VIA_IP 0 diff --git a/www/node22/files/patch-deps-v8-src-libsampler-sampler.cc b/www/node22/files/patch-deps-v8-src-libsampler-sampler.cc new file mode 100644 index 000000000000..dd19d75d8196 --- /dev/null +++ b/www/node22/files/patch-deps-v8-src-libsampler-sampler.cc @@ -0,0 +1,13 @@ +--- deps/v8/src/libsampler/sampler.cc.orig 2023-05-16 06:58:20 UTC ++++ deps/v8/src/libsampler/sampler.cc +@@ -511,6 +511,10 @@ void SignalHandler::FillRegisterState(void* context, R + state->pc = reinterpret_cast<void*>(mcontext.__gregs[_REG_PC]); + state->sp = reinterpret_cast<void*>(mcontext.__gregs[_REG_SP]); + state->fp = reinterpret_cast<void*>(mcontext.__gregs[_REG_FP]); ++#elif V8_TARGET_ARCH_PPC64 ++ state->pc = reinterpret_cast<void*>(mcontext.mc_srr0); ++ state->sp = reinterpret_cast<void*>(mcontext.mc_frame[1]); ++ state->fp = reinterpret_cast<void*>(mcontext.mc_frame[31]); + #endif // V8_HOST_ARCH_* + #elif V8_OS_NETBSD + #if V8_HOST_ARCH_IA32 diff --git a/www/node22/files/patch-node.gypi b/www/node22/files/patch-node.gypi new file mode 100644 index 000000000000..c1f4c867c303 --- /dev/null +++ b/www/node22/files/patch-node.gypi @@ -0,0 +1,12 @@ +--- node.gypi.orig 2023-05-16 06:58:21 UTC ++++ node.gypi +@@ -349,6 +349,9 @@ + [ 'node_use_openssl=="true"', { + 'defines': [ 'HAVE_OPENSSL=1' ], + 'conditions': [ ++ ['openssl_no_asm==1', { ++ 'defines': [ 'OPENSSL_NO_ASM' ], ++ }], + [ 'node_shared_openssl=="false"', { + 'defines': [ 'OPENSSL_API_COMPAT=0x10100000L', ], + 'dependencies': [ diff --git a/www/node22/files/patch-openssl3 b/www/node22/files/patch-openssl3 new file mode 100644 index 000000000000..0e80424bd33c --- /dev/null +++ b/www/node22/files/patch-openssl3 @@ -0,0 +1,15 @@ +--- src/crypto/crypto_util.cc.orig 2023-05-16 06:58:21 UTC ++++ src/crypto/crypto_util.cc +@@ -205,10 +205,12 @@ void InitCryptoOnce() { + // No-op with OPENSSL_NO_COMP builds of OpenSSL. + sk_SSL_COMP_zero(SSL_COMP_get_compression_methods()); + ++#if OPENSSL_VERSION_MAJOR < 3 + #ifndef OPENSSL_NO_ENGINE + ERR_load_ENGINE_strings(); + ENGINE_load_builtin_engines(); + #endif // !OPENSSL_NO_ENGINE ++#endif + } + + void GetFipsCrypto(const FunctionCallbackInfo<Value>& args) { diff --git a/www/node22/files/patch-src-cares_wrap.h b/www/node22/files/patch-src-cares_wrap.h new file mode 100644 index 000000000000..7bac6f049408 --- /dev/null +++ b/www/node22/files/patch-src-cares_wrap.h @@ -0,0 +1,11 @@ +--- src/cares_wrap.h.orig 2023-05-16 06:58:21 UTC ++++ src/cares_wrap.h +@@ -23,7 +23,7 @@ + # include <netdb.h> + #endif // __POSIX__ + +-# include <ares_nameser.h> ++# include <arpa/nameser.h> + + namespace node { + namespace cares_wrap { diff --git a/www/node22/files/patch-tools-v8_gypfiles-v8.gyp b/www/node22/files/patch-tools-v8_gypfiles-v8.gyp new file mode 100644 index 000000000000..61657d4c24a1 --- /dev/null +++ b/www/node22/files/patch-tools-v8_gypfiles-v8.gyp @@ -0,0 +1,11 @@ +--- tools/v8_gypfiles/v8.gyp.orig 2023-05-16 06:58:22 UTC ++++ tools/v8_gypfiles/v8.gyp +@@ -1091,7 +1091,7 @@ + }], + # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library + # to implement atomic memory access +- ['v8_current_cpu in ["mips64", "mips64el", "ppc", "arm", "riscv64", "loong64"]', { ++ ['v8_current_cpu in ["mips64", "mips64el", "ppc", "riscv64", "loong64"]', { + 'link_settings': { + 'libraries': ['-latomic', ], + }, |