Upstream backport: gzip b4ed8e73401968bcad749afb0e636dd3ec205ca7, "build: avoid failure to build on linux aarch64" (Jim Meyering, 2026-09-21, the day after the 1.15 release; https://bugs.gnu.org/81904). https://git.savannah.gnu.org/cgit/gzip.git/commit/?id=b4ed8e73401968bcad749afb0e636dd3ec205ca7 gzip.h defines a macro "head"; gzip.c included it before , whose aarch64 asm/sigcontext.h has a struct member named head, so gzip 1.15 does not compile for aarch64 ("expected ')' before '+' token"). gzip.c now includes gzip.h after every system header. No change in what is compiled on x86_64. Verified 2026-10-22 (build 342, D266): ./build.sh x86_64|aarch64 gzip --force. Retire at the first release that contains the commit (`patch -R --dry-run`). diff --git a/gzip.c b/gzip.c index 220f6fc..6c0af7f 100644 --- a/gzip.c +++ b/gzip.c @@ -58,7 +58,6 @@ static char const license_msg[] = #include "tailor.h" -#include "gzip.h" #include "lzw.h" #include "revision.h" #include "version.h" @@ -99,6 +98,11 @@ static char const license_msg[] = # include #endif +/* Include this only after all system headers. Otherwise, its definition + of "head" conflicts with member names in linux-headers 7.2.6's + asm/sigcontext.h pulled in via . */ +#include "gzip.h" + #ifndef MAX_PATH_LEN # define MAX_PATH_LEN 1024 /* max pathname length */ #endif