From 5a7d2a58c8b30609f2ba38134ce28b49629d3635 Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Mon, 28 Jun 2021 10:07:58 +0200 Subject: [PATCH] hsavmcore: Fix fuse dependency checking MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit all target should not depend on check_dep but only objects which use fuse header. This fixes issues with parallel build of hsavmcore. Signed-off-by: Alexander Egorenkov Reported-by: Ingo Franzki Acked-by: Jan Höppner Signed-off-by: Jan Höppner --- hsavmcore/Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/hsavmcore/Makefile b/hsavmcore/Makefile index b75fe24c..544d7d71 100644 --- a/hsavmcore/Makefile +++ b/hsavmcore/Makefile @@ -7,6 +7,8 @@ include ../common.mak +ALL_CPPFLAGS += -D_FILE_OFFSET_BITS=64 + ifeq (${HAVE_FUSE},0) all: @@ -46,7 +48,6 @@ ifneq (${HAVE_SYSTEMD},0) endif endif -ALL_CPPFLAGS += -D_FILE_OFFSET_BITS=64 ALL_CFLAGS += $(FUSE_CFLAGS) $(SYSTEMD_CFLAGS) LDLIBS += $(FUSE_LDLIBS) $(SYSTEMD_LDLIBS) -lpthread @@ -64,18 +65,20 @@ OBJECTS = \ libs = $(rootdir)/libutil/libutil.a -all: check_dep hsavmcore +all: hsavmcore -check_dep: +hsavmcore: $(OBJECTS) $(libs) + $(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@ + +overlay.o: check-dep-fuse overlay.c overlay.h + +check-dep-fuse: $(call check_dep, \ "hsavmcore", \ "fuse.h", \ "fuse-devel or libfuse-dev", \ "HAVE_FUSE=0") -hsavmcore: $(OBJECTS) $(libs) - $(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@ - install: all $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 hsavmcore \ $(DESTDIR)$(USRSBINDIR)