[packages/nodejs] upstream fix to correct flags used for internal abseil
atler
atler at pld-linux.org
Tue Jun 17 12:21:43 CEST 2025
commit d380d6baf43df7fe7e9aa2e9e7255acce272c563
Author: Jan Palus <atler at pld-linux.org>
Date: Tue Jun 17 11:24:17 2025 +0200
upstream fix to correct flags used for internal abseil
from: https://github.com/nodejs/node/pull/58678
fixes: https://github.com/nodejs/node/issues/58569
regressed by: https://github.com/nodejs/node/pull/57982
abseil-flags.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
nodejs.spec | 5 +++--
2 files changed, 55 insertions(+), 2 deletions(-)
---
diff --git a/nodejs.spec b/nodejs.spec
index 52a8657..1db174a 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -30,8 +30,7 @@ Name: nodejs
# Maintenance start: October 2025
# Maintenance end: April 2027
Version: 22.16.0
-# FIXME: with 22.16.0 yarn (1.22.10 and 1.22.22 tested) hangs during python3-furo build; nodejs 22.15.1 works
-Release: 0.1
+Release: 1
License: BSD and MIT and Apache v2.0 and GPL v3
Group: Development/Languages
Source0: https://nodejs.org/download/release/latest-v22.x/node-v%{version}.tar.xz
@@ -43,6 +42,7 @@ Patch1: %{name}-lib64path.patch
Patch2: 0001-Remove-unused-OpenSSL-config.patch
Patch3: arm-yield.patch
Patch4: cflags.patch
+Patch5: abseil-flags.patch
URL: https://nodejs.org/
BuildRequires: c-ares-devel >= 1.17.2
BuildRequires: gcc >= 6:6.3
@@ -156,6 +156,7 @@ Ten pakiet zawiera dokumentację Node.js.
%patch -P2 -p1
%patch -P3 -p1
%patch -P4 -p1
+%patch -P5 -p1
grep -r '#!.*env python' -l . | xargs %{__sed} -i -e '1 s,#!.*env python$,#!%{__python3},'
diff --git a/abseil-flags.patch b/abseil-flags.patch
new file mode 100644
index 0000000..f6849ac
--- /dev/null
+++ b/abseil-flags.patch
@@ -0,0 +1,52 @@
+From 4c80ac0194c24d6bc75cb61052529cf9aff1d409 Mon Sep 17 00:00:00 2001
+From: Chengzhong Wu <cwu631 at bloomberg.net>
+Date: Wed, 11 Jun 2025 15:04:21 +0100
+Subject: [PATCH] tools: include toolchain.gypi in abseil.gyp
+
+This sets proper SIMD build flags for abseil on ia32.
+---
+ tools/v8_gypfiles/abseil.gyp | 1 +
+ tools/v8_gypfiles/toolchain.gypi | 4 ----
+ tools/v8_gypfiles/v8.gyp | 4 ++++
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/tools/v8_gypfiles/abseil.gyp b/tools/v8_gypfiles/abseil.gyp
+index 2f71382d04fe52..ec5e1aea029ec2 100644
+--- a/tools/v8_gypfiles/abseil.gyp
++++ b/tools/v8_gypfiles/abseil.gyp
+@@ -1,4 +1,5 @@
+ {
++ 'includes': ['toolchain.gypi', 'features.gypi'],
+ 'targets': [
+ {
+ 'target_name': 'abseil',
+diff --git a/tools/v8_gypfiles/toolchain.gypi b/tools/v8_gypfiles/toolchain.gypi
+index a3462d2bb33e1a..794c01a5f089c2 100644
+--- a/tools/v8_gypfiles/toolchain.gypi
++++ b/tools/v8_gypfiles/toolchain.gypi
+@@ -98,10 +98,6 @@
+ }],
+ ],
+ 'target_defaults': {
+- 'include_dirs': [
+- '<(V8_ROOT)',
+- '<(V8_ROOT)/include',
+- ],
+ 'cflags!': ['-Wall', '-Wextra'],
+ 'conditions': [
+ ['clang==0 and OS!="win"', {
+diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
+index 3ea5564d5463a2..4134ef5c1810f3 100644
+--- a/tools/v8_gypfiles/v8.gyp
++++ b/tools/v8_gypfiles/v8.gyp
+@@ -36,6 +36,10 @@
+ },
+ 'includes': ['toolchain.gypi', 'features.gypi'],
+ 'target_defaults': {
++ 'include_dirs': [
++ '<(V8_ROOT)',
++ '<(V8_ROOT)/include',
++ ],
+ 'msvs_settings': {
+ 'VCCLCompilerTool': {
+ 'AdditionalOptions': ['/utf-8']
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nodejs.git/commitdiff/d380d6baf43df7fe7e9aa2e9e7255acce272c563
More information about the pld-cvs-commit
mailing list