kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

hsavmcore: Fix fuse dependency checking

Browse Source 
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 <egorenar@linux.ibm.com>
Reported-by: Ingo Franzki <ifranzki@linux.ibm.com>
Acked-by: Jan Höppner <hoeppner@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Alexander Egorenkov
2021-06-28 10:07:58 +02:00
committed by Jan Höppner
parent 89d25559e0
commit 5a7d2a58c8
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
hsavmcore/Makefile
View File

@@ -7,6 +7,8 @@
include ../common.mak include ../common.mak
ALL_CPPFLAGS += -D_FILE_OFFSET_BITS=64
ifeq (${HAVE_FUSE},0) ifeq (${HAVE_FUSE},0)
all: all:
@@ -46,7 +48,6 @@ ifneq (${HAVE_SYSTEMD},0)
endif endif
endif endif
ALL_CPPFLAGS += -D_FILE_OFFSET_BITS=64
ALL_CFLAGS += $(FUSE_CFLAGS) $(SYSTEMD_CFLAGS) ALL_CFLAGS += $(FUSE_CFLAGS) $(SYSTEMD_CFLAGS)
LDLIBS += $(FUSE_LDLIBS) $(SYSTEMD_LDLIBS) -lpthread LDLIBS += $(FUSE_LDLIBS) $(SYSTEMD_LDLIBS) -lpthread
@@ -64,18 +65,20 @@ OBJECTS = \
libs = $(rootdir)/libutil/libutil.a 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, \ $(call check_dep, \
"hsavmcore", \ "hsavmcore", \
"fuse.h", \ "fuse.h", \
"fuse-devel or libfuse-dev", \ "fuse-devel or libfuse-dev", \
"HAVE_FUSE=0") "HAVE_FUSE=0")
hsavmcore: $(OBJECTS) $(libs)
$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
install: all install: all
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 hsavmcore \ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 hsavmcore \
$(DESTDIR)$(USRSBINDIR) $(DESTDIR)$(USRSBINDIR)