rpms/nodejs20
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 20.1.0

Browse Source 
https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V20.md#20.1.0

Also drop upstreamed patch

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
This commit is contained in:
Stephen Gallagher 2023-05-04 15:27:30 -04:00
parent d8fdc60e0f
commit 6d822b2572
No known key found for this signature in database
GPG Key ID: 45DB85A568286D11
5 changed files with 17 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0001-Remove-unused-OpenSSL-config.patch
View File

@ -1,4 +1,4 @@
From ff8035bf1039a63785cbb325b24f1d9520b17854 Mon Sep 17 00:00:00 2001 From d1e3011bc4fdbc0abcbf80692d84906dce8c4556 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com> From: Stephen Gallagher <sgallagh@redhat.com>
Date: Fri, 17 Apr 2020 12:59:44 +0200 Date: Fri, 17 Apr 2020 12:59:44 +0200
Subject: [PATCH] Remove unused OpenSSL config Subject: [PATCH] Remove unused OpenSSL config
@ -13,10 +13,10 @@ Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
1 file changed, 17 deletions(-) 1 file changed, 17 deletions(-)
diff --git a/node.gyp b/node.gyp diff --git a/node.gyp b/node.gyp
index 6d1b2bf36902cf54f33513873441c403c2e7ee3d..e5c1f696ffb14421df1a5626be6cf1c6738d870e 100644 index eb7a43e4a0eb9da8ba352905f4becfb3214be149..6d49a45e731ba146ac9d832618a82c7f5b10284f 100644
--- a/node.gyp --- a/node.gyp
+++ b/node.gyp +++ b/node.gyp
@@ -421,23 +421,6 @@ @@ -729,23 +729,6 @@
], ],
}, },
], ],
@ -41,5 +41,5 @@ index 6d1b2bf36902cf54f33513873441c403c2e7ee3d..e5c1f696ffb14421df1a5626be6cf1c6
], ],
}, # node_core_target_name }, # node_core_target_name
-- --
2.39.2 2.40.1

41
0002-libstdc-fix-incomplete-type-in-v8-internal-is_subtyp.patch
View File

@ -1,41 +0,0 @@
From a6cc04e2e21212cd6dae6d868002549bfd0cba21 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Mon, 3 Apr 2023 12:19:34 +0200
Subject: [PATCH 2/2] libstdc++: fix incomplete type in
v8::internal::is_subtype<T, U>
Using std::convertible with incomplete types is UB. However, till
GCC 12 it was accepted and std::convertible returned false.
This fails now for e.g. v8::internal::WasmArray. Use
std::disjunction and std::conjunction instead which are short-
circuiting, because std::is_base_of<T, T> is already true.
Bug: chromium:957519
Change-Id: Ia26643dbdf0fb00d5586c71ae6b18e8d0f3cf96e
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4394663
Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Cr-Commit-Position: refs/heads/main@{#86904}
---
deps/v8/src/codegen/tnode.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/deps/v8/src/codegen/tnode.h b/deps/v8/src/codegen/tnode.h
index 1f2a3dcfd9c5e3007d2de5bbe730eaac1aec3066..9360425c2edfc5e2369152a0f75aae21f3120645 100644
--- a/deps/v8/src/codegen/tnode.h
+++ b/deps/v8/src/codegen/tnode.h
@@ -266,8 +266,9 @@ using BuiltinPtr = Smi;
template <class T, class U>
struct is_subtype {
static const bool value =
- std::is_base_of<U, T>::value || (std::is_same<U, MaybeObject>::value &&
- std::is_convertible<T, Object>::value);
+ std::disjunction<std::is_base_of<U, T>,
+ std::conjunction<std::is_same<U, MaybeObject>,
+ std::is_convertible<T, Object>>>::value;
};
template <class T1, class T2, class U>
struct is_subtype<UnionT<T1, T2>, U> {
--
2.40.0

14
nodejs20.spec
View File

@ -26,7 +26,7 @@
# than a Fedora release lifecycle. # than a Fedora release lifecycle.
%global nodejs_epoch 1 %global nodejs_epoch 1
%global nodejs_major 20 %global nodejs_major 20
%global nodejs_minor 0 %global nodejs_minor 1
%global nodejs_patch 0 %global nodejs_patch 0
# nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h
%global nodejs_soversion 115 %global nodejs_soversion 115
@ -56,7 +56,7 @@
%global v8_major 11 %global v8_major 11
%global v8_minor 3 %global v8_minor 3
%global v8_build 244 %global v8_build 244
%global v8_patch 4 %global v8_patch 8
%global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch} %global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch}
%global v8_release %{nodejs_epoch}.%{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}.%{nodejs_release} %global v8_release %{nodejs_epoch}.%{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}.%{nodejs_release}
@ -77,7 +77,7 @@
%global nghttp2_version 1.52.0 %global nghttp2_version 1.52.0
# ICU - from tools/icu/current_ver.dep # ICU - from tools/icu/current_ver.dep
%global icu_major 72 %global icu_major 73
%global icu_minor 1 %global icu_minor 1
%global icu_version %{icu_major}.%{icu_minor} %global icu_version %{icu_major}.%{icu_minor}
@ -145,11 +145,10 @@ Source203: v8.pc.in
# These are generated by nodejs-sources.sh # These are generated by nodejs-sources.sh
Source101: cjs-module-lexer-1.2.2-stripped.tar.gz Source101: cjs-module-lexer-1.2.2-stripped.tar.gz
Source102: wasi-sdk-11.0-linux.tar.gz Source102: wasi-sdk-11.0-linux.tar.gz
Source111: undici-5.21.0-stripped.tar.gz Source111: undici-5.22.0-stripped.tar.gz
Source112: wasi-sdk-14.0-linux.tar.gz Source112: wasi-sdk-14.0-linux.tar.gz
Patch: 0001-Remove-unused-OpenSSL-config.patch Patch: 0001-Remove-unused-OpenSSL-config.patch
Patch: 0002-libstdc-fix-incomplete-type-in-v8-internal-is_subtyp.patch
%if 0%{?nodejs_default} %if 0%{?nodejs_default}
%global pkgname nodejs %global pkgname nodejs
@ -300,7 +299,7 @@ Provides: bundled(histogram) = %{histogram_version}
# Upstream has added a new URL parser that has no option to build as a shared # Upstream has added a new URL parser that has no option to build as a shared
# library (19.7.0+) # library (19.7.0+)
Provides: bundled(ada) = 2.0.0 Provides: bundled(ada) = 2.3.0
%description %description
@ -512,7 +511,8 @@ extra_cflags=(
-D_FILE_OFFSET_BITS=64 -D_FILE_OFFSET_BITS=64
-DZLIB_CONST -DZLIB_CONST
-fno-delete-null-pointer-checks -fno-delete-null-pointer-checks
-O1 -O3
-fno-ipa-icf
) )
export CFLAGS="%{optflags} ${extra_cflags[*]}" CXXFLAGS="%{optflags} ${extra_cflags[*]}" export CFLAGS="%{optflags} ${extra_cflags[*]}" CXXFLAGS="%{optflags} ${extra_cflags[*]}"
export LDFLAGS="%{build_ldflags}" export LDFLAGS="%{build_ldflags}"

1
packaging/nodejs.spec.j2
View File

@ -524,6 +524,7 @@ extra_cflags=(
-DZLIB_CONST -DZLIB_CONST
-fno-delete-null-pointer-checks -fno-delete-null-pointer-checks
-O3 -O3
-fno-ipa-icf
) )
export CFLAGS="%{optflags} ${extra_cflags[*]}" CXXFLAGS="%{optflags} ${extra_cflags[*]}" export CFLAGS="%{optflags} ${extra_cflags[*]}" CXXFLAGS="%{optflags} ${extra_cflags[*]}"
export LDFLAGS="%{build_ldflags}" export LDFLAGS="%{build_ldflags}"

10
sources
View File

@ -1,7 +1,7 @@
SHA512 (node-v20.0.0-stripped.tar.gz) = cfdee11e46c83aa4ee46f25a30ef8d44a26ee053e515a6745e6e73963979086e3ca7a9027524c1bb1e36a733cfc6aa05b0784e5829896958a7d7925ec52c394a SHA512 (node-v20.1.0-stripped.tar.gz) = 434ecedd398baa2f8a723964727fb1e9c42c005f591431fe428ee32e0ef05f86b79a7b4484f6d914353b77393fe7bc46ce5933958ca266897ecb30ad7619d304
SHA512 (icu4c-72_1-data-bin-b.zip) = ed0ce3ebd02f81cca7b3808abc72dc99962eb36bd123ebdf45c578b307b674566491191b6f7d261c679b2b5662b7084c61452b98968b35df3f749d413d5d7663 SHA512 (icu4c-73_1-data-bin-b.zip) = 8b11f143021dbbb13f2c64e9558f36442448384ca8653c57b5f6a462f3b801608d8c3fc111c70931215cf8ced182914b2aeb2d159f3b1139eb5a37932efe85c7
SHA512 (icu4c-72_1-data-bin-l.zip) = cc9a8cf2a89dacde4fab4a68ca7a7ba1fd106b71ebc23318fb9293ab96001be825bf89b1daf3da02958ba201ca4f714a67a26db3a51dc03653b9970ebdd5ff56 SHA512 (icu4c-73_1-data-bin-l.zip) = 41948aecd3eeb907866c2dec532bde55aed03c45e92668ea8d53ca21cd6fb50b0131e118586245e7a0bd7b728c3f619524437d4ab75b360e2d123a8a8b11d584
SHA512 (cjs-module-lexer-1.2.2-stripped.tar.gz) = de1adbdbea215bb4c3d95441199cd91324e999c8749ab7df831691c85dd9a47714a027f4cb3f97ed6e6198b37da390c48695aa9592f9cdb522ee3bbf3769aecb SHA512 (cjs-module-lexer-1.2.2-stripped.tar.gz) = 8164089e6fc2326956a950358cdcb68bad0427b31c738f91b65a4a77aeb8320703cb712aa79e2e6e82aed7af8197a8e2e1edf8852db3d6c95856e06899040e82
SHA512 (wasi-sdk-11.0-linux.tar.gz) = e3ed4597f7f2290967eef6238e9046f60abbcb8633a4a2a51525d00e7393df8df637a98a5b668217d332dd44fcbf2442ec7efd5e65724e888d90611164451e20 SHA512 (wasi-sdk-11.0-linux.tar.gz) = e3ed4597f7f2290967eef6238e9046f60abbcb8633a4a2a51525d00e7393df8df637a98a5b668217d332dd44fcbf2442ec7efd5e65724e888d90611164451e20
SHA512 (undici-5.21.0-stripped.tar.gz) = 3de2f040a418c247165575433ae28b551da16b4e9d8e67a59df6f9e48786acb19905bf15e3a4213095d38ab50c6698595313fd44b64acf5f495643d56f570a1f SHA512 (undici-5.22.0-stripped.tar.gz) = 3dc734b678e08f5a03da496bc0a4bd0b0280753a5379403b2ba557f99244534450ef6045b120d4d8fbd332a0a2e1a26a83d0143ebeb98c3da7232a80f430aa6d
SHA512 (wasi-sdk-14.0-linux.tar.gz) = 288a367e051f5b3f5853de97fabaedd3acf2255819d50c24f48f573897518500ea808342fd9aea832b2a5717089807bf1cbcf6d46b156b4eb60cc6b3c02ee997 SHA512 (wasi-sdk-14.0-linux.tar.gz) = 288a367e051f5b3f5853de97fabaedd3acf2255819d50c24f48f573897518500ea808342fd9aea832b2a5717089807bf1cbcf6d46b156b4eb60cc6b3c02ee997