已合并
Fix rpm spec parsing error #254
wk333创建于 8月21日
Fix rpm spec parsing error #254
已合并
共 1 个文件变更+12-6
| @@ -1,4 +1,4 @@ | |||
| 1 | -%global baserelease 3 | 1 | +%global baserelease 4 |
| 2 | %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} | 2 | %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} |
| 3 | %global nodejs_epoch 1 | 3 | %global nodejs_epoch 1 |
| 4 | %global nodejs_major 24 | 4 | %global nodejs_major 24 |
| @@ -63,6 +63,12 @@ | |||
| 63 | # dtrace is not supported on Node.js 19+ | 63 | # dtrace is not supported on Node.js 19+ |
| 64 | %global dtrace_configure %{nil} | 64 | %global dtrace_configure %{nil} |
| 65 | 65 | ||
| 66 | +%if "%{?toolchain}" == "clang" || "%{_arch}" == "riscv64" | ||
| 67 | +%global lto_option %{nil} | ||
| 68 | +%else | ||
| 69 | +%global lto_option --enable-lto | ||
| 70 | +%endif | ||
| 71 | + | ||
| 66 | Name: nodejs | 72 | Name: nodejs |
| 67 | Epoch: %{nodejs_epoch} | 73 | Epoch: %{nodejs_epoch} |
| 68 | Version: %{nodejs_version} | 74 | Version: %{nodejs_version} |
| @@ -269,11 +275,7 @@ export CXXFLAGS="$CXXFLAGS -DHWY_BROKEN_EMU128=0" | |||
| 269 | --with-icu-default-data-dir=%{icudatadir} \ | 275 | --with-icu-default-data-dir=%{icudatadir} \ |
| 270 | --without-corepack \ | 276 | --without-corepack \ |
| 271 | --openssl-use-def-ca-store \ | 277 | --openssl-use-def-ca-store \ |
| 272 | -%ifnarch riscv64 | 278 | + %{lto_option} |
| 273 | -%if "%toolchain" != "clang" | ||
| 274 | - --enable-lto | ||
| 275 | -%endif | ||
| 276 | -%endif | ||
| 277 | 279 | ||
| 278 | %ninja_build -C out/Release | 280 | %ninja_build -C out/Release |
| 279 | 281 | ||
| @@ -420,9 +422,13 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/nod | |||
| 420 | %{_pkgdocdir}/npm/docs | 422 | %{_pkgdocdir}/npm/docs |
| 421 | 423 | ||
| 422 | %changelog | 424 | %changelog |
| 425 | +* Fri Aug 21 2026 wangkai <13474090681@163.com> - 1:24.18.1-4 | ||
| 426 | +- Fix rpm spec parsing error | ||
| 427 | + | ||
| 423 | * Tue Aug 18 2026 Wenlong Zhang <zhangwenlong@loongson.cn> - 1:24.18.1-3 | 428 | * Tue Aug 18 2026 Wenlong Zhang <zhangwenlong@loongson.cn> - 1:24.18.1-3 |
| 424 | - fix build error on loongarch64 | 429 | - fix build error on loongarch64 |
| 425 | - fix https://github.com/nodejs/node/issues/62642 | 430 | - fix https://github.com/nodejs/node/issues/62642 |
| 431 | + | ||
| 426 | * Wed Aug 12 2026 jchzhou <zhoujiacheng@iscas.ac.cn> - 1:24.18.1-2 | 432 | * Wed Aug 12 2026 jchzhou <zhoujiacheng@iscas.ac.cn> - 1:24.18.1-2 |
| 427 | - riscv64: temporarily disable LTO to workaround a linking issue | 433 | - riscv64: temporarily disable LTO to workaround a linking issue |
| 428 | 434 | ||