From nobody Sun May 5 04:31:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1611328503; cv=none; d=zohomail.com; s=zohoarc; b=AsCIf87py3pHS6AxMEZURrayFprSakf0ucdXXtP1eTyTrCwa4Hcy6gzLW8P3dQajCmdNNE2HngdOSalzYl5igrcdoV5U9B3gZG3HD4m5MCnUdCIYTaIQHWZMtPDTw8JRDT67XetJLlKPxVxkLuWeQJvk9YTVUy556Kq51xArHEw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611328503; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=o77QcCORTwruCKZaKWE882+Adk7xW9OlbIdyAQkRSHM=; b=eumAbgFTxANFBRb/fp5aF60dOIVBJxytUkS5gMME8WoOiQEbmVHei4rhFlUFeVI23jQWofFUP9SgvsARZQdvDsHMJbfMUzsahncBAlElQQN8I25mJ4tEzFTr54H4VDyZj02pRFBv+BdlvxxJs/qERBSrneR0dRn2xttQVl7f7Fk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1611328503437322.90350242185445; Fri, 22 Jan 2021 07:15:03 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.72842.131269 (Exim 4.92) (envelope-from ) id 1l2y8w-0008Am-N5; Fri, 22 Jan 2021 15:14:34 +0000 Received: by outflank-mailman (output) from mailman id 72842.131269; Fri, 22 Jan 2021 15:14:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2y8w-0008Af-K2; Fri, 22 Jan 2021 15:14:34 +0000 Received: by outflank-mailman (input) for mailman id 72842; Fri, 22 Jan 2021 15:14:32 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2y8u-00089m-GL for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:14:32 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 04219876-0b43-4dce-9aec-d4dc72feeec3; Fri, 22 Jan 2021 15:14:31 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 6C80CB7CA; Fri, 22 Jan 2021 15:14:30 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version 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" X-Inumbo-ID: 04219876-0b43-4dce-9aec-d4dc72feeec3 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=1611328470; h=from:from:reply-to: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=o77QcCORTwruCKZaKWE882+Adk7xW9OlbIdyAQkRSHM=; b=Ogxf5+SJzDH/p+5Jy7JXGA5+x+BO4f+UJ+F+noHatD+gOT07yv1IPbOmhi3ba081L0i81c aKR2nDZsp9PIVlnVETa1Si6E4oAEaozwkO02+donzeXZOz1HsSEAlfRnmyIhpCs+EV9X6L TTf4RXwU5qjoMumU6PXiPlRq0MuVZV4= To: "xen-devel@lists.xenproject.org" Cc: Ian Jackson , Wei Liu , Anthony Perard From: Jan Beulich Subject: [PATCH] tools/libs: honor build dependencies for recently moved subdirs Message-ID: <42328c2a-0c4a-af4b-4fad-349e16bd45c3@suse.com> Date: Fri, 22 Jan 2021 16:14:30 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.1 MIME-Version: 1.0 Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" While the lack of proper dependency tracking of #include-d files is wider than just the libs/ subtree, dealing with the problem universally there or in tools/Rules.mk is too much of a risk at this point in the release cycle. Add the missing inclusion of $(DEPS_INCLUDE) only in the specific Makefile-s, after having checked that their prior Makefile-s had such includes. Interestingly the $(DEPS_RM) use is present in tools/libs/libs.mk's clean target, so doesn't need taking care of in individual Makefile-s. Signed-off-by: Jan Beulich Release-acked-by: Ian Jackson Acked-by: Wei Liu --- a/tools/libs/ctrl/Makefile +++ b/tools/libs/ctrl/Makefile @@ -62,6 +62,8 @@ $(eval $(genpath-target)) =20 $(LIB_OBJS) $(PIC_OBJS): _paths.h =20 +-include $(DEPS_INCLUDE) + clean: cleanlocal =20 .PHONY: cleanlocal --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -108,6 +108,8 @@ $(eval $(genpath-target)) =20 xc_private.h: _paths.h =20 +-include $(DEPS_INCLUDE) + .PHONY: cleanlocal cleanlocal: rm -f libxenguest.map --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -271,3 +271,5 @@ cleanlocal: $(RM) -f libxenlight.map $(RM) -f $(AUTOSRCS) $(AUTOINCS) $(MAKE) -C $(ACPI_PATH) ACPI_BUILD_DIR=3D$(CURDIR) clean + +-include $(DEPS_INCLUDE) --- a/tools/libs/store/Makefile +++ b/tools/libs/store/Makefile @@ -31,6 +31,8 @@ else PKG_CONFIG_REMOVE +=3D -ldl endif =20 +-include $(DEPS_INCLUDE) + .PHONY: install install: install-headers =20 --- a/tools/libs/util/Makefile +++ b/tools/libs/util/Makefile @@ -52,6 +52,8 @@ $(LIB_OBJS) $(PIC_OBJS): $(AUTOINCS) _pa genpath-target =3D $(call buildmakevars2header,_paths.h) $(eval $(genpath-target)) =20 +-include $(DEPS_INCLUDE) + clean: cleanlocal =20 .PHONY: cleanlocal --- a/tools/libs/vchan/Makefile +++ b/tools/libs/vchan/Makefile @@ -11,6 +11,7 @@ SRCS-y +=3D io.c NO_HEADERS_CHK :=3D y =20 include $(XEN_ROOT)/tools/libs/libs.mk +-include $(DEPS_INCLUDE) =20 clean: cleanlocal =20