From patchwork Tue Oct 27 11:40:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 11860087 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 17FA614B2 for ; Tue, 27 Oct 2020 11:42:25 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C6CD420773 for ; Tue, 27 Oct 2020 11:42:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="sl8eD0k+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6CD420773 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.12809.33177 (Exim 4.92) (envelope-from ) id 1kXNL8-0007XH-3T; Tue, 27 Oct 2020 11:40:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 12809.33177; Tue, 27 Oct 2020 11:40:34 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kXNL8-0007XA-04; Tue, 27 Oct 2020 11:40:34 +0000 Received: by outflank-mailman (input) for mailman id 12809; Tue, 27 Oct 2020 11:40:31 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kXNL5-0007X3-RP for xen-devel@lists.xenproject.org; Tue, 27 Oct 2020 11:40:31 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 27acd177-d817-4b45-8b04-a63c1cdbf551; Tue, 27 Oct 2020 11:40:30 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 70BD8B21E; Tue, 27 Oct 2020 11:40:29 +0000 (UTC) Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kXNL5-0007X3-RP for xen-devel@lists.xenproject.org; Tue, 27 Oct 2020 11:40:31 +0000 X-Inumbo-ID: 27acd177-d817-4b45-8b04-a63c1cdbf551 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 27acd177-d817-4b45-8b04-a63c1cdbf551; Tue, 27 Oct 2020 11:40:30 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1603798829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ExArnadxcx3JAKnobevenpT6dgaB39uPFzazX6DJsIE=; b=sl8eD0k+0NI9L6smI9aauvdi0j6+ihgEa6nUfZ+V5bmq1S0k0bUsbEBjfFhQW96cBL3zWb k5ZOIpd4sb435A25dttiHI5lCUI5ZCcg+iGI5yEK8SLfbiwNrN1EX6TAyJ2T2trRIVKXiO 5oDIcTr4PcK+FtRytl0t7rzBKNKT9X8= Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 70BD8B21E; Tue, 27 Oct 2020 11:40:29 +0000 (UTC) To: "xen-devel@lists.xenproject.org" Cc: Ian Jackson , Wei Liu , Anthony Perard , Olaf Hering From: Jan Beulich Subject: [PATCH] libxl: fix libacpi dependency Message-ID: Date: Tue, 27 Oct 2020 12:40:29 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 Content-Language: en-US $(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 Fixes: 14c0d328da2b ("libxl/acpi: Build ACPI tables for HVMlite guests") Signed-off-by: Jan Beulich Acked-by: Wei Liu --- Arguably we might also use $(ACPI_OBJS) instead of specifying just the one object file we know has respective #include directives. --- 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)) --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -32,7 +32,7 @@ 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 ACPI_PIC_OBJS = $(patsubst %.o,%.opic,$(ACPI_OBJS)) -$(DSDT_FILES-y): acpi +$(DSDT_FILES-y) build.o: acpi vpath build.c $(ACPI_PATH)/ vpath static_tables.c $(ACPI_PATH)/