[staging-next] sasquatch: fix build for gcc 15 (#472892)
This commit is contained in:
@@ -0,0 +1,22 @@
|
||||
diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
|
||||
index ed5096b32d..adb6a91c7e 100644
|
||||
--- a/squashfs-tools/unsquashfs.c
|
||||
+++ b/squashfs-tools/unsquashfs.c
|
||||
@@ -146,7 +146,7 @@
|
||||
|
||||
#define MAX_LINE 16384
|
||||
|
||||
-void sigwinch_handler()
|
||||
+void sigwinch_handler(int _signal)
|
||||
{
|
||||
struct winsize winsize;
|
||||
|
||||
@@ -160,7 +160,7 @@
|
||||
}
|
||||
|
||||
|
||||
-void sigalrm_handler()
|
||||
+void sigalrm_handler(int _signal)
|
||||
{
|
||||
rotate = (rotate + 1) % 4;
|
||||
}
|
||||
@@ -23,7 +23,12 @@ let
|
||||
hash = "sha256-4Mltt0yFt4oh9hsrHL8/ch5n7nZYiXIJ1UgLktPvlKQ=";
|
||||
};
|
||||
|
||||
patches = lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;
|
||||
patches = [
|
||||
# Fix build for GCC 15/C23 by adding parameters to unsquashfs signal
|
||||
# handlers instead of relying on an empty parameter list.
|
||||
./gcc15-fix-prototypes.patch
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ which ];
|
||||
|
||||
Reference in New Issue
Block a user