From 50aa6da65adbeea50152753b86fb02f22bb88a22 Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Wed, 27 Dec 2023 20:33:30 -0800 Subject: [PATCH] make: fix compilation on alpine Starting with the musl v1.2.4~69, _GNU_SOURCE doesn't set _LARGEFILE64_SOURCE. Fixes #2313 Signed-off-by: Andrei Vagin --- Makefile | 1 + scripts/build/Dockerfile.alpine | 2 +- test/zdtm/Makefile.inc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7e6bb40d0d..ff0ca92db6 100644 --- a/Makefile +++ b/Makefile @@ -106,6 +106,7 @@ export PROTOUFIX DEFINES # # Independent options for all tools. DEFINES += -D_FILE_OFFSET_BITS=64 +DEFINES += -D_LARGEFILE64_SOURCE DEFINES += -D_GNU_SOURCE WARNINGS := -Wall -Wformat-security -Wdeclaration-after-statement -Wstrict-prototypes diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine index cb746757a4..593e190315 100644 --- a/scripts/build/Dockerfile.alpine +++ b/scripts/build/Dockerfile.alpine @@ -47,6 +47,6 @@ RUN apk add \ # The rpc test cases are running as user #1000, let's add the user RUN adduser -u 1000 -D test -RUN pip3 install junit_xml +RUN pip3 install junit_xml --break-system-packages RUN make -C test/zdtm diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc index 2456260e66..24f32c6068 100644 --- a/test/zdtm/Makefile.inc +++ b/test/zdtm/Makefile.inc @@ -41,7 +41,7 @@ PKG_CONFIG ?= pkg-config CFLAGS += -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 CFLAGS += -Wdeclaration-after-statement -Wstrict-prototypes CFLAGS += $(USERCFLAGS) $(ARCHCFLAGS) -CFLAGS += -D_GNU_SOURCE +CFLAGS += -D_GNU_SOURCE -D_LARGEFILE64_SOURCE CPPFLAGS += -iquote $(LIBDIR)/arch/$(ARCH)/include ifeq ($(strip $(V)),)