From 3f72a67d9a2060444b45ba0167879c1b494c4764 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sat, 22 Mar 2025 20:41:36 +0100 Subject: [PATCH] msieve: unbreak on GCC 14 --- pkgs/by-name/ms/msieve/package.nix | 4 +++ .../ms/msieve/savefile_t-pointer-type.patch | 31 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/by-name/ms/msieve/savefile_t-pointer-type.patch diff --git a/pkgs/by-name/ms/msieve/package.nix b/pkgs/by-name/ms/msieve/package.nix index 2562eea0c80b..b449c4e64c9b 100644 --- a/pkgs/by-name/ms/msieve/package.nix +++ b/pkgs/by-name/ms/msieve/package.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { hash = "sha256-6ErVn4pYPMG5VFjOQURLsHNpN0pGdp55+rjY8988onU="; }; + patches = [ ./savefile_t-pointer-type.patch ]; + buildInputs = [ zlib gmp @@ -31,6 +33,8 @@ stdenv.mkDerivation rec { "all" ]; + enableParallelBuilding = true; + installPhase = '' mkdir -p $out/bin/ cp msieve $out/bin/ diff --git a/pkgs/by-name/ms/msieve/savefile_t-pointer-type.patch b/pkgs/by-name/ms/msieve/savefile_t-pointer-type.patch new file mode 100644 index 000000000000..32f5514328ba --- /dev/null +++ b/pkgs/by-name/ms/msieve/savefile_t-pointer-type.patch @@ -0,0 +1,31 @@ +Index: include/msieve.h +=================================================================== +--- a/include/msieve.h ++++ b/include/msieve.h +@@ -100,9 +100,9 @@ + HANDLE file_handle; + uint32 read_size; + uint32 eof; + #else +- gzFile *fp; ++ gzFile fp; + char isCompressed; + char is_a_FILE; + #endif + char *name; + +Index: common/savefile.c +=================================================================== +--- a/common/savefile.c ++++ b/common/savefile.c +@@ -151,9 +151,9 @@ + so we will fopen a FILE to append plainly */ + fclose(fp); + } + if (s->is_a_FILE) { +- s->fp = (gzFile *)fopen(s->name, "a"); ++ s->fp = (gzFile)fopen(s->name, "a"); + } else { + s->fp = gzopen(s->name, "a"); + s->isCompressed = 1; + }