remake: fix build with gcc15
Specifically this error:
In file included from command/break.c:30:
command/../../src/makeint.h:616:7: error: conflicting types for 'getcwd'; have 'char *(void)'
616 | char *getcwd ();
| ^~~~~~
In file included from /nix/store/dj43clc5ff7jjnfmhbaj6q4q0h8kpfpm-glibc-2.40-66-dev/include/features.h:511,
from /nix/store/dj43clc5ff7jjnfmhbaj6q4q0h8kpfpm-glibc-2.40-66-dev/include/alloca.h:21,
from command/../../src/makeint.h:35:
/nix/store/dj43clc5ff7jjnfmhbaj6q4q0h8kpfpm-glibc-2.40-66-dev/include/bits/unistd.h:111:1: note: previous definition of 'getcwd' with type 'char *(char *, size_t)' {aka 'char *(char *, long unsigned int)'}
111 | __NTH (getcwd (__fortify_clang_overload_arg (char *, , __buf), size_t __size))
| ^~~~~
Upstream has already fixed it in their development branch, so
fetch/apply their patch.
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
pkg-config,
|
||||
readline,
|
||||
guileSupport ? false,
|
||||
@@ -21,6 +22,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
./glibc-2.27-glob.patch
|
||||
(fetchpatch {
|
||||
name = "gcc15-tolerance.patch";
|
||||
url = "https://github.com/Trepan-Debuggers/remake/commit/15f36a69b1a7798fa836d849c68c0fa5cd1dae6f.patch";
|
||||
hash = "sha256-Pau0ho0stPFnJjsHKY6lIag/XV4A0bEKBLPp3XRcxc8=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Reference in New Issue
Block a user