File libxl.fix-libacpi-dependency.patch of Package xen.30823

Overview Repositories Revisions Requests Users Attributes Meta

File libxl.fix-libacpi-dependency.patch of Package xen.30823

From: Jan Beulich <jbeulich@suse.com>
Date: Thu, 5 Nov 2020 16:48:55 +0100
Subject: libxl: fix libacpi dependency
Git-commit: e006b2e3be72e502b86bd9e1405417abd87bdfed

$(DSDT_FILES-y) depends on the recursive make to have run in libacpi/
such that the file(s) itself/themselves were generated before
compilation gets attempted. The same, however, is also necessary for
generated headers, before source files including them would get
attempted to be compiled.

The dependency specified in libacpi's Makefile, otoh, is entirely
pointless nowadays - no compilation happens there anymore (except for
tools involved in building the generated files). Together with it, the
rule generating acpi.a also can go away.

Reported-by: Olaf Hering <olaf@aepfle.de>
Fixes: 14c0d328da2b ("libxl/acpi: Build ACPI tables for HVMlite guests")
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Wei Liu <wl@xen.org>
---
 tools/libacpi/Makefile    | 5 -----
 tools/libxl/Makefile | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/tools/libacpi/Makefile b/tools/libacpi/Makefile
index c17f3924cc..2448687dbb 100644
--- a/tools/libacpi/Makefile
+++ b/tools/libacpi/Makefile
@@ -89,11 +89,6 @@ iasl:
 	@echo 
 	@exit 1
 
-build.o: ssdt_s3.h ssdt_s4.h ssdt_pm.h ssdt_tpm.h ssdt_laptop_slate.h
-
-acpi.a: $(OBJS)
-	$(AR) rc $@ $(OBJS)
-
 clean:
 	rm -f $(C_SRC) $(H_SRC) $(MK_DSDT) $(C_SRC:=.$(TMP_SUFFIX))
 	rm -f $(patsubst %.c,%.hex,$(C_SRC)) $(patsubst %.c,%.aml,$(C_SRC)) $(patsubst %.c,%.asl,$(C_SRC))
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index 3424fdb61b..68f6fa315f 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -80,7 +80,7 @@ ACPI_PATH  = $(XEN_ROOT)/tools/libacpi
 ACPI_PATH  = $(XEN_ROOT)/tools/libacpi
 DSDT_FILES-$(CONFIG_X86) = dsdt_pvh.c
 ACPI_OBJS  = $(patsubst %.c,%.o,$(DSDT_FILES-y)) build.o static_tables.o
-$(DSDT_FILES-y): acpi
+$(DSDT_FILES-y) build.o: acpi
 $(ACPI_OBJS): CFLAGS += -I. -DLIBACPI_STDUTILS=\"$(CURDIR)/libxl_x86_acpi.h\"
 vpath build.c $(ACPI_PATH)/
 vpath static_tables.c $(ACPI_PATH)/

Places

File libxl.fix-libacpi-dependency.patch of Package xen.30823

Places