Skip to content

Commit

Permalink
make: fix compilation on alpine
Browse files Browse the repository at this point in the history
Starting with the musl v1.2.4~69, _GNU_SOURCE doesn't set _LARGEFILE64_SOURCE.

Fixes #2313
Signed-off-by: Andrei Vagin <avagin@gmail.com>
  • Loading branch information
avagin committed Dec 30, 2023
1 parent 61224f2 commit 50aa6da
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/build/Dockerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion test/zdtm/Makefile.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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)),)
Expand Down

0 comments on commit 50aa6da

Please sign in to comment.