From fa12a0c6cee88d8aa3e86591f1f18b79bed698ab Mon Sep 17 00:00:00 2001 From: ghpzin Date: Tue, 9 Dec 2025 10:20:28 +0300 Subject: [PATCH] scalapack: fix build with gcc15 - add patch from merged upstream PR: https://www.github.com/Reference-ScaLAPACK/scalapack/pull/139 https://github.com/Reference-ScaLAPACK/scalapack/commit/0cd017afa3eefd0597cfe71b7bcfd6356a258da2 Upstream issue: https://www.github.com/Reference-ScaLAPACK/scalapack/issues/129 Fixes build failure with gcc15: ``` /build/source/TOOLS/reshape.c: In function 'Creshape': /build/source/TOOLS/reshape.c:32:4: error: too many arguments to function 'Cblacs_gridinfo'; expected 0, have 5 32 | Cblacs_gridinfo( context_in, &nprow_in, &npcol_in, &myrow_in, &mycol_in ); | ^~~~~~~~~~~~~~~ ~~~~~~~~~~ /build/source/TOOLS/reshape.c:15:9: note: declared here 15 | void Cblacs_gridinfo(); | ^~~~~~~~~~~~~~~ /build/source/TOOLS/reshape.c:63:14: error: too many arguments to function 'Cblacs_pnum'; expected 0, have 3 63 | pnum = Cblacs_pnum( context_in, myrow_old, mycol_old ); | ^~~~~~~~~~~ ~~~~~~~~~~ /build/source/TOOLS/reshape.c:16:8: note: declared here 16 | Int Cblacs_pnum(); | ^~~~~~~~~~~ /build/source/TOOLS/reshape.c:65:7: error: too many arguments to function 'proc_inc'; expected 0, have 5 65 | proc_inc( &myrow_old, &mycol_old, nprow_in, npcol_in, major_in ); | ^~~~~~~~ ~~~~~~~~~~ /build/source/TOOLS/reshape.c:14:9: note: declared here 14 | void proc_inc(); | ^~~~~~~~ /build/source/TOOLS/reshape.c:66:7: error: too many arguments to function 'proc_inc'; expected 0, have 5 66 | proc_inc( &myrow_new, &mycol_new, nprow_new, npcol_new, major_out ); | ^~~~~~~~ ~~~~~~~~~~ /build/source/TOOLS/reshape.c:14:9: note: declared here 14 | void proc_inc(); | ^~~~~~~~ /build/source/TOOLS/reshape.c:70:4: error: too many arguments to function 'Cblacs_get'; expected 0, have 3 70 | Cblacs_get( context_in, 10, context_out ); | ^~~~~~~~~~ ~~~~~~~~~~ /build/source/TOOLS/reshape.c:17:9: note: declared here 17 | void Cblacs_get(); | ^~~~~~~~~~ /build/source/TOOLS/reshape.c:73:4: error: too many arguments to function 'Cblacs_gridmap'; expected 0, have 5 73 | Cblacs_gridmap( context_out, grid_new, nprow_new, nprow_new, npcol_new ); | ^~~~~~~~~~~~~~ ~~~~~~~~~~~ /build/source/TOOLS/reshape.c:18:9: note: declared here 18 | void Cblacs_gridmap(); | ^~~~~~~~~~~~~~ ... ``` --- pkgs/by-name/sc/scalapack/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/sc/scalapack/package.nix b/pkgs/by-name/sc/scalapack/package.nix index 408337773ba7..049eff90a8d8 100644 --- a/pkgs/by-name/sc/scalapack/package.nix +++ b/pkgs/by-name/sc/scalapack/package.nix @@ -46,6 +46,14 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/c3d6b22b0032fd2b8772d99c2239c18473e197a7.patch"; hash = "sha256-935KtaqPO2cghbD9Z8YMxGGOQJo1D1LqTje6/IL4bGI="; }) + + # Fix build with gcc15 + # https://github.com/Reference-ScaLAPACK/scalapack/pull/139 + (fetchpatch { + name = "scalapack-fix-function-declaration-arguments.patch"; + url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/0cd017afa3eefd0597cfe71b7bcfd6356a258da2.patch"; + hash = "sha256-uUdazKplDt8K5yuVaHX5pLFqDMh0F7eBBGEHfxOiM0Y="; + }) ]; # Required to activate ILP64.