Skip to content

Commit 742b72c

Browse files
committed
v24.6.0
1 parent 73d4428 commit 742b72c

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

build-alpine.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -eu
44

5-
node_ver=v24.3.0
5+
node_ver=v24.6.0
66

77
apk add \
88
clang \

lto.diff

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/common.gypi b/common.gypi
2-
index a6a79adc..160b6eb6 100644
2+
index 4a78c902..ee84e685 100644
33
--- a/common.gypi
44
+++ b/common.gypi
5-
@@ -185,9 +185,9 @@
5+
@@ -190,9 +190,9 @@
66
'MSVC_runtimeType': 2 # MultiThreadedDLL (/MD)
77
}],
88
['clang==1', {
@@ -15,10 +15,10 @@ index a6a79adc..160b6eb6 100644
1515
],
1616
},
1717
diff --git a/deps/cares/configure b/deps/cares/configure
18-
index d02f117d..468461f7 100755
18+
index 7a29494d..dbb46253 100755
1919
--- a/deps/cares/configure
2020
+++ b/deps/cares/configure
21-
@@ -16139,11 +16139,6 @@ _LT_EOF
21+
@@ -16275,11 +16275,6 @@ _LT_EOF
2222

2323

2424
_lt_libdeps_save_CFLAGS=$CFLAGS
@@ -31,10 +31,10 @@ index d02f117d..468461f7 100755
3131
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
3232
(eval $ac_compile) 2>&5
3333
diff --git a/deps/cares/m4/libtool.m4 b/deps/cares/m4/libtool.m4
34-
index c4c02946..9f3d3662 100755
34+
index e7b68334..13ec17a6 100755
3535
--- a/deps/cares/m4/libtool.m4
3636
+++ b/deps/cares/m4/libtool.m4
37-
@@ -7537,11 +7537,6 @@ _LT_EOF
37+
@@ -7562,11 +7562,6 @@ _LT_EOF
3838
])
3939

4040
_lt_libdeps_save_CFLAGS=$CFLAGS
@@ -47,10 +47,10 @@ index c4c02946..9f3d3662 100755
4747
dnl Parse the compiler output and extract the necessary
4848
dnl objects, libraries and library flags.
4949
diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
50-
index 5f2c097f..42dad126 100644
50+
index 85a63dfd..9c262c9f 100644
5151
--- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
5252
+++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
53-
@@ -638,7 +638,7 @@ class XcodeSettings:
53+
@@ -636,7 +636,7 @@ class XcodeSettings:
5454
# if the system clang isn't used, DYLD_LIBRARY_PATH needs to contain the
5555
# path to the libLTO.dylib that matches the used clang.
5656
if self._Test("LLVM_LTO", "YES", default="NO"):
@@ -59,7 +59,7 @@ index 5f2c097f..42dad126 100644
5959

6060
self._AppendPlatformVersionMinFlags(cflags)
6161

62-
@@ -1101,7 +1101,7 @@ class XcodeSettings:
62+
@@ -1099,7 +1099,7 @@ class XcodeSettings:
6363
# For static libraries, no dSYMs are created.
6464
result = []
6565
if (
@@ -69,7 +69,7 @@ index 5f2c097f..42dad126 100644
6969
"DEBUG_INFORMATION_FORMAT", "dwarf-with-dsym", default="dwarf"
7070
)
7171
diff --git a/deps/openssl/openssl-cli.gypi b/deps/openssl/openssl-cli.gypi
72-
index b4c278b4..79cafd6b 100644
72+
index ae74be9a..4e8517e5 100644
7373
--- a/deps/openssl/openssl-cli.gypi
7474
+++ b/deps/openssl/openssl-cli.gypi
7575
@@ -23,7 +23,7 @@
@@ -95,10 +95,10 @@ index ea3a2dc0..ea3780f7 100644
9595
]
9696
}, {
9797
diff --git a/node.gyp b/node.gyp
98-
index a3688b8e..d320299f 100644
98+
index bcf01a6b..e5495afc 100644
9999
--- a/node.gyp
100100
+++ b/node.gyp
101-
@@ -1069,7 +1069,7 @@
101+
@@ -1080,7 +1080,7 @@
102102
}],
103103
# Avoid excessive LTO
104104
['enable_lto=="true"', {
@@ -107,7 +107,7 @@ index a3688b8e..d320299f 100644
107107
}],
108108
],
109109
}, # fuzz_env
110-
@@ -1112,7 +1112,7 @@
110+
@@ -1123,7 +1123,7 @@
111111
}],
112112
# Avoid excessive LTO
113113
['enable_lto=="true"', {
@@ -116,7 +116,7 @@ index a3688b8e..d320299f 100644
116116
}],
117117
],
118118
}, # fuzz_ClientHelloParser.cc
119-
@@ -1157,7 +1157,7 @@
119+
@@ -1168,7 +1168,7 @@
120120
}],
121121
# Avoid excessive LTO
122122
['enable_lto=="true"', {
@@ -125,7 +125,7 @@ index a3688b8e..d320299f 100644
125125
}],
126126
],
127127
}, # fuzz_strings
128-
@@ -1235,7 +1235,7 @@
128+
@@ -1256,7 +1256,7 @@
129129
}],
130130
# Avoid excessive LTO
131131
['enable_lto=="true"', {
@@ -134,7 +134,7 @@ index a3688b8e..d320299f 100644
134134
}],
135135
],
136136
}, # cctest
137-
@@ -1291,7 +1291,7 @@
137+
@@ -1312,7 +1312,7 @@
138138
}],
139139
# Avoid excessive LTO
140140
['enable_lto=="true"', {
@@ -143,7 +143,7 @@ index a3688b8e..d320299f 100644
143143
}],
144144
],
145145
}, # embedtest
146-
@@ -1333,7 +1333,7 @@
146+
@@ -1334,7 +1334,7 @@
147147
}],
148148
# Avoid excessive LTO
149149
['enable_lto=="true"', {
@@ -152,7 +152,7 @@ index a3688b8e..d320299f 100644
152152
}],
153153
]
154154
}, # overlapped-checker
155-
@@ -1439,7 +1439,7 @@
155+
@@ -1447,7 +1447,7 @@
156156
}],
157157
# Avoid excessive LTO
158158
['enable_lto=="true"', {
@@ -162,10 +162,10 @@ index a3688b8e..d320299f 100644
162162
],
163163
}, # node_mksnapshot
164164
diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
165-
index aee1a542..162881d1 100644
165+
index 0746865d..a4b15d6a 100644
166166
--- a/tools/gyp/pylib/gyp/xcode_emulation.py
167167
+++ b/tools/gyp/pylib/gyp/xcode_emulation.py
168-
@@ -638,7 +638,7 @@ class XcodeSettings:
168+
@@ -636,7 +636,7 @@ class XcodeSettings:
169169
# if the system clang isn't used, DYLD_LIBRARY_PATH needs to contain the
170170
# path to the libLTO.dylib that matches the used clang.
171171
if self._Test("LLVM_LTO", "YES", default="NO"):
@@ -174,7 +174,7 @@ index aee1a542..162881d1 100644
174174

175175
self._AppendPlatformVersionMinFlags(cflags)
176176

177-
@@ -1101,7 +1101,7 @@ class XcodeSettings:
177+
@@ -1099,7 +1099,7 @@ class XcodeSettings:
178178
# For static libraries, no dSYMs are created.
179179
result = []
180180
if (
@@ -224,7 +224,7 @@ index f007c652..ac69a873 100644
224224
],
225225
},
226226
diff --git a/tools/v8_gypfiles/d8.gyp b/tools/v8_gypfiles/d8.gyp
227-
index 4dd98972..27165061 100644
227+
index f5f8a194..d2a6306e 100644
228228
--- a/tools/v8_gypfiles/d8.gyp
229229
+++ b/tools/v8_gypfiles/d8.gyp
230230
@@ -65,7 +65,7 @@
@@ -237,10 +237,10 @@ index 4dd98972..27165061 100644
237237
],
238238
},
239239
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
240-
index 88c1297b..a640a7ff 100644
240+
index 32f00097..e7db9d49 100644
241241
--- a/tools/v8_gypfiles/v8.gyp
242242
+++ b/tools/v8_gypfiles/v8.gyp
243-
@@ -1690,7 +1690,7 @@
243+
@@ -1706,7 +1706,7 @@
244244
}],
245245
# Avoid excessive LTO
246246
['enable_lto=="true"', {
@@ -249,7 +249,7 @@ index 88c1297b..a640a7ff 100644
249249
}],
250250
],
251251
'defines!': [
252-
@@ -1752,7 +1752,7 @@
252+
@@ -1768,7 +1768,7 @@
253253
}],
254254
# Avoid excessive LTO
255255
['enable_lto=="true"', {
@@ -258,7 +258,7 @@ index 88c1297b..a640a7ff 100644
258258
}],
259259
],
260260
}, # mksnapshot
261-
@@ -1769,7 +1769,7 @@
261+
@@ -1786,7 +1786,7 @@
262262
}],
263263
# Avoid excessive LTO
264264
['enable_lto=="true"', {
@@ -267,7 +267,7 @@ index 88c1297b..a640a7ff 100644
267267
}],
268268
],
269269
'defines!': [
270-
@@ -1807,7 +1807,7 @@
270+
@@ -1824,7 +1824,7 @@
271271
}],
272272
# Avoid excessive LTO
273273
['enable_lto=="true"', {
@@ -276,7 +276,7 @@ index 88c1297b..a640a7ff 100644
276276
}],
277277
],
278278
'dependencies': [
279-
@@ -1843,7 +1843,7 @@
279+
@@ -1861,7 +1861,7 @@
280280
}],
281281
# Avoid excessive LTO
282282
['enable_lto=="true"', {
@@ -285,7 +285,7 @@ index 88c1297b..a640a7ff 100644
285285
}],
286286
],
287287
'sources': [
288-
@@ -1863,7 +1863,7 @@
288+
@@ -1881,7 +1881,7 @@
289289
}],
290290
# Avoid excessive LTO
291291
['enable_lto=="true"', {
@@ -294,7 +294,7 @@ index 88c1297b..a640a7ff 100644
294294
}],
295295
],
296296
'actions': [
297-
@@ -1931,7 +1931,7 @@
297+
@@ -1949,7 +1949,7 @@
298298
],
299299
'conditions': [
300300
['enable_lto=="true"', {

0 commit comments

Comments
 (0)