Skip to content

Commit d380d6b

Browse files
committed
upstream fix to correct flags used for internal abseil
from: nodejs/node#58678 fixes: nodejs/node#58569 regressed by: nodejs/node#57982
1 parent 7aa74cf commit d380d6b

File tree

2 files changed

+55
-2
lines changed

2 files changed

+55
-2
lines changed

abseil-flags.patch

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
From 4c80ac0194c24d6bc75cb61052529cf9aff1d409 Mon Sep 17 00:00:00 2001
2+
From: Chengzhong Wu <[email protected]>
3+
Date: Wed, 11 Jun 2025 15:04:21 +0100
4+
Subject: [PATCH] tools: include toolchain.gypi in abseil.gyp
5+
6+
This sets proper SIMD build flags for abseil on ia32.
7+
---
8+
tools/v8_gypfiles/abseil.gyp | 1 +
9+
tools/v8_gypfiles/toolchain.gypi | 4 ----
10+
tools/v8_gypfiles/v8.gyp | 4 ++++
11+
3 files changed, 5 insertions(+), 4 deletions(-)
12+
13+
diff --git a/tools/v8_gypfiles/abseil.gyp b/tools/v8_gypfiles/abseil.gyp
14+
index 2f71382d04fe52..ec5e1aea029ec2 100644
15+
--- a/tools/v8_gypfiles/abseil.gyp
16+
+++ b/tools/v8_gypfiles/abseil.gyp
17+
@@ -1,4 +1,5 @@
18+
{
19+
+ 'includes': ['toolchain.gypi', 'features.gypi'],
20+
'targets': [
21+
{
22+
'target_name': 'abseil',
23+
diff --git a/tools/v8_gypfiles/toolchain.gypi b/tools/v8_gypfiles/toolchain.gypi
24+
index a3462d2bb33e1a..794c01a5f089c2 100644
25+
--- a/tools/v8_gypfiles/toolchain.gypi
26+
+++ b/tools/v8_gypfiles/toolchain.gypi
27+
@@ -98,10 +98,6 @@
28+
}],
29+
],
30+
'target_defaults': {
31+
- 'include_dirs': [
32+
- '<(V8_ROOT)',
33+
- '<(V8_ROOT)/include',
34+
- ],
35+
'cflags!': ['-Wall', '-Wextra'],
36+
'conditions': [
37+
['clang==0 and OS!="win"', {
38+
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
39+
index 3ea5564d5463a2..4134ef5c1810f3 100644
40+
--- a/tools/v8_gypfiles/v8.gyp
41+
+++ b/tools/v8_gypfiles/v8.gyp
42+
@@ -36,6 +36,10 @@
43+
},
44+
'includes': ['toolchain.gypi', 'features.gypi'],
45+
'target_defaults': {
46+
+ 'include_dirs': [
47+
+ '<(V8_ROOT)',
48+
+ '<(V8_ROOT)/include',
49+
+ ],
50+
'msvs_settings': {
51+
'VCCLCompilerTool': {
52+
'AdditionalOptions': ['/utf-8']

nodejs.spec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ Name: nodejs
3030
# Maintenance start: October 2025
3131
# Maintenance end: April 2027
3232
Version: 22.16.0
33-
# FIXME: with 22.16.0 yarn (1.22.10 and 1.22.22 tested) hangs during python3-furo build; nodejs 22.15.1 works
34-
Release: 0.1
33+
Release: 1
3534
License: BSD and MIT and Apache v2.0 and GPL v3
3635
Group: Development/Languages
3736
Source0: https://nodejs.org/download/release/latest-v22.x/node-v%{version}.tar.xz
@@ -43,6 +42,7 @@ Patch1: %{name}-lib64path.patch
4342
Patch2: 0001-Remove-unused-OpenSSL-config.patch
4443
Patch3: arm-yield.patch
4544
Patch4: cflags.patch
45+
Patch5: abseil-flags.patch
4646
URL: https://nodejs.org/
4747
BuildRequires: c-ares-devel >= 1.17.2
4848
BuildRequires: gcc >= 6:6.3
@@ -156,6 +156,7 @@ Ten pakiet zawiera dokumentację Node.js.
156156
%patch -P2 -p1
157157
%patch -P3 -p1
158158
%patch -P4 -p1
159+
%patch -P5 -p1
159160

160161
grep -r '#!.*env python' -l . | xargs %{__sed} -i -e '1 s,#!.*env python$,#!%{__python3},'
161162

0 commit comments

Comments
 (0)