nodejs20, bump to latest LST release (#10734)

This commit is contained in:
Schrijvers Luc
2024-07-26 07:53:01 +02:00
committed by GitHub
parent 5cf328e847
commit 64cc5e8de2
2 changed files with 52 additions and 44 deletions

View File

@@ -7,10 +7,10 @@ to be done, Node will sleep."
HOMEPAGE="https://nodejs.org/"
COPYRIGHT="2006-2019 The Node.js Foundation"
LICENSE="BSD (2-clause)"
REVISION="2"
SOURCE_URI="https://github.com/nodejs/node/archive/v$portVersion/nodejs-$portVersion.tar.gz"
SOURCE_DIR="node-$portVersion"
CHECKSUM_SHA256="97fa9283e5472d4252794c930ad59270e4851cc523fe5469f37f65a344f5f2e2"
REVISION="1"
SOURCE_URI="https://nodejs.org/dist/v$portVersion/node-v$portVersion.tar.gz"
CHECKSUM_SHA256="da228a0c27922f02001d9a781793696432096ab2da658eb77d7fc21693f4c5cb"
SOURCE_DIR="node-v$portVersion"
PATCHES="nodejs-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
@@ -18,11 +18,13 @@ SECONDARY_ARCHITECTURES="?x86"
PROVIDES="
nodejs20$secondaryArchSuffix = $portVersion
cmd:corepack = $portVersion compat >= 16
cmd:node = $portVersion compat >= 16
cmd:corepack = $portVersion compat >= 20
cmd:node = $portVersion compat >= 20
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libbrotlidec$secondaryArchSuffix
lib:libbrotlienc$secondaryArchSuffix
lib:libcares$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
lib:libexecinfo$secondaryArchSuffix
@@ -44,6 +46,8 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libbrotlidec$secondaryArchSuffix
devel:libbrotlienc$secondaryArchSuffix
devel:libcares$secondaryArchSuffix
devel:libexecinfo$secondaryArchSuffix
devel:libicudata$secondaryArchSuffix >= 74
@@ -68,10 +72,14 @@ BUILD_PREREQUIRES="
BUILD()
{
./configure --with-intl=system-icu --dest-os=haiku \
--shared-cares --shared-libuv --shared-nghttp2 --shared-openssl \
--shared-brotli \
--shared-cares \
--shared-libuv \
--shared-nghttp2 \
--shared-openssl \
--shared-zlib \
--prefix=$prefix --without-npm
--without-npm \
--prefix=$prefix
make $jobArgs
}

View File

@@ -1,14 +1,14 @@
From 1d11fef6b118c120ad364caefae40ac97333c01f Mon Sep 17 00:00:00 2001
From 85e2fbaf4ccb8edcfd2d21728ec49a2dc8a76e1c Mon Sep 17 00:00:00 2001
From: Calvin Hill <calvin@hakobaito.co.uk>
Date: Wed, 22 May 2019 11:23:37 +0000
Subject: Initial support for Node.js
diff --git a/common.gypi b/common.gypi
index d783c7f..8c06be8 100644
index 0af8af3..05843ce 100644
--- a/common.gypi
+++ b/common.gypi
@@ -275,6 +275,9 @@
@@ -281,6 +281,9 @@
'_target_name!="<(node_core_target_name)")', {
'cflags!': ['-Werror'],
}],
@@ -18,7 +18,7 @@ index d783c7f..8c06be8 100644
],
'msvs_settings': {
'VCCLCompilerTool': {
@@ -307,6 +310,10 @@
@@ -313,6 +316,10 @@
['target_arch=="arm64"', {
'TargetMachine' : 0, # NotSet. MACHINE:ARM64 is inferred from the input files.
}],
@@ -29,9 +29,9 @@ index d783c7f..8c06be8 100644
],
'GenerateDebugInformation': 'true',
'SuppressStartupBanner': 'true',
@@ -367,6 +374,10 @@
@@ -396,6 +403,10 @@
['_type!="static_library"', {
'xcode_settings': {'OTHER_LDFLAGS': ['-fsanitize=address']},
'xcode_settings': {'OTHER_LDFLAGS': ['-fsanitize=undefined']},
}],
+ ['OS == "haiku"', {
+ 'cflags': [ '-fPIC' ],
@@ -39,8 +39,8 @@ index d783c7f..8c06be8 100644
+ }],
],
}],
['v8_enable_pointer_compression == 1', {
@@ -397,7 +408,7 @@
# The defines bellow must include all things from the external_v8_defines
@@ -461,7 +472,7 @@
'cflags': [ '-pthread' ],
'ldflags': [ '-pthread' ],
}],
@@ -49,7 +49,7 @@ index d783c7f..8c06be8 100644
'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ],
'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++17' ],
'defines': [ '__STDC_FORMAT_MACROS' ],
@@ -411,6 +422,10 @@
@@ -475,6 +486,10 @@
'cflags': [ '-I/usr/local/include' ],
'ldflags': [ '-Wl,-z,wxneeded' ],
}],
@@ -60,7 +60,7 @@ index d783c7f..8c06be8 100644
['_toolset=="host"', {
'conditions': [
[ 'host_arch=="ia32"', {
@@ -590,6 +605,12 @@
@@ -654,6 +669,12 @@
'OPENSSL_NO_PINSHARED'
],
}],
@@ -74,10 +74,10 @@ index d783c7f..8c06be8 100644
# `OPENSSL_THREADS` is defined via GYP for openSSL for all architectures.
'defines': [
diff --git a/configure.py b/configure.py
index 62f041c..80b055e 100755
index f189ba2..48b5547 100755
--- a/configure.py
+++ b/configure.py
@@ -47,7 +47,7 @@ from utils import SearchFiles
@@ -46,7 +46,7 @@ from utils import SearchFiles
parser = argparse.ArgumentParser()
valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux',
@@ -135,7 +135,7 @@ index 750afca..bfe435e 100644
if (getentropy != NULL) {
diff --git a/deps/openssl/openssl_common.gypi b/deps/openssl/openssl_common.gypi
index 256eb7d..395b850 100644
index 8745ec1..b361444 100644
--- a/deps/openssl/openssl_common.gypi
+++ b/deps/openssl/openssl_common.gypi
@@ -58,7 +58,14 @@
@@ -155,10 +155,10 @@ index 256eb7d..395b850 100644
'cflags': ['-Wno-missing-field-initializers',],
'defines': [
diff --git a/node.gypi b/node.gypi
index 9138317..e564490 100644
index 9513381..0a4df48 100644
--- a/node.gypi
+++ b/node.gypi
@@ -280,6 +280,16 @@
@@ -281,6 +281,16 @@
'NODE_PLATFORM="sunos"',
],
}],
@@ -176,10 +176,10 @@ index 9138317..e564490 100644
' and force_load=="true"', {
'ldflags': [
diff --git a/src/node.cc b/src/node.cc
index 89e0e55..4b321db 100644
index bc7720a..4d2f854 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -475,10 +475,10 @@ void ResetSignalHandlers() {
@@ -523,10 +523,10 @@ void ResetSignalHandlers() {
// library) has set up own signal handler for own purposes
// (e.g. profiling). If that's the case, we want to keep it intact.
struct sigaction old;
@@ -236,10 +236,10 @@ index 7318c1a..dec4e1e 100644
diff --git a/src/node_report.cc b/src/node_report.cc
index 88c9a97..2703003 100644
index 46881e3..0904c98 100644
--- a/src/node_report.cc
+++ b/src/node_report.cc
@@ -740,16 +740,16 @@ static void PrintSystemInformation(JSONWriter* writer) {
@@ -725,16 +725,16 @@ static void PrintSystemInformation(JSONWriter* writer) {
{"core_file_size_blocks", RLIMIT_CORE},
{"data_seg_size_kbytes", RLIMIT_DATA},
{"file_size_blocks", RLIMIT_FSIZE},
@@ -260,7 +260,7 @@ index 88c9a97..2703003 100644
#endif
#ifndef __OpenBSD__
diff --git a/tools/utils.py b/tools/utils.py
index 32a3b3d..52febec 100644
index f0172b3..d7cb21a 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -59,6 +59,8 @@ def GuessOS():
@@ -273,17 +273,17 @@ index 32a3b3d..52febec 100644
return 'openbsd'
elif id == 'SunOS':
--
2.42.0
2.45.2
From 0af727a5425ee2db008e7e09bcdd4878b259556b Mon Sep 17 00:00:00 2001
From 945e896f009f266c9176512c2dfb2a7109d2c69a Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 27 Mar 2021 14:01:44 +0100
Subject: Haiku v8 patches
diff --git a/deps/v8/BUILD.gn b/deps/v8/BUILD.gn
index 68d92c3..e7da754 100644
index c42d5b8..8d50fac 100644
--- a/deps/v8/BUILD.gn
+++ b/deps/v8/BUILD.gn
@@ -442,7 +442,7 @@ if (v8_enable_snapshot_native_code_counters == "") {
@@ -304,7 +304,7 @@ index 68d92c3..e7da754 100644
cflags += [
"-Wmissing-field-initializers",
"-Wunreachable-code",
@@ -5842,6 +5842,11 @@ v8_component("v8_libbase") {
@@ -5864,6 +5864,11 @@ v8_component("v8_libbase") {
"//third_party/fuchsia-sdk/sdk/pkg/fdio",
"//third_party/fuchsia-sdk/sdk/pkg/zx",
]
@@ -316,7 +316,7 @@ index 68d92c3..e7da754 100644
} else if (is_mac) {
sources += [
"src/base/debug/stack_trace_posix.cc",
@@ -6677,6 +6682,13 @@ if (is_fuchsia && !build_with_chromium) {
@@ -6699,6 +6704,13 @@ if (is_fuchsia && !build_with_chromium) {
group("v8_fuzzers") {
testonly = true
@@ -330,7 +330,7 @@ index 68d92c3..e7da754 100644
data_deps = [
":v8_simple_inspector_fuzzer",
":v8_simple_json_fuzzer",
@@ -6891,6 +6903,8 @@ v8_executable("v8_hello_world") {
@@ -6913,6 +6925,8 @@ v8_executable("v8_hello_world") {
":v8_libplatform",
"//build/win:default_exe_manifest",
]
@@ -598,17 +598,17 @@ index f42b52b..1b59e8c 100755
gn_path = 'gn'
else:
--
2.42.0
2.45.2
From 00ec02375fa6f43221e932d7b13e1dce273c7cd0 Mon Sep 17 00:00:00 2001
From eac024fb73493ffca36ed55b3557116c820adadb Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 27 Mar 2021 18:23:32 +0100
Subject: v8 gyp build for Haiku
diff --git a/tools/v8_gypfiles/features.gypi b/tools/v8_gypfiles/features.gypi
index 3a7f355..22b4013 100644
index c768d7a..cd209e7 100644
--- a/tools/v8_gypfiles/features.gypi
+++ b/tools/v8_gypfiles/features.gypi
@@ -46,6 +46,11 @@
@@ -624,10 +624,10 @@ index 3a7f355..22b4013 100644
'is_android': 1,
}, {
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
index 109d0ea..6c3224c 100644
index 9ffa6e9..d4aab88 100644
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -1248,6 +1248,17 @@
@@ -1269,6 +1269,17 @@
'<(V8_ROOT)/src/base/platform/platform-fuchsia.cc',
]
}],
@@ -646,10 +646,10 @@ index 109d0ea..6c3224c 100644
'sources': [
'<(V8_ROOT)/src/base/debug/stack_trace_posix.cc',
--
2.42.0
2.45.2
From cd06c9edafe011fb98e44553c7542c9d84e60754 Mon Sep 17 00:00:00 2001
From 62d08ffefae3edafee09c3bd82d2fe9273288683 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 15 Oct 2021 22:06:57 +0200
Subject: ares compat
@@ -669,7 +669,7 @@ index 77b0b19..31aca75 100644
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100641
extern __thread int g_thread_in_wasm_code;
diff --git a/src/cares_wrap.h b/src/cares_wrap.h
index ea339b7..e443018 100644
index 021ef1c..a53ef2a 100644
--- a/src/cares_wrap.h
+++ b/src/cares_wrap.h
@@ -23,7 +23,11 @@
@@ -685,5 +685,5 @@ index ea339b7..e443018 100644
namespace node {
namespace cares_wrap {
--
2.42.0
2.45.2