[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 3/3] tools/libs: Fix headers.chk logic
- To: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
- Date: Fri, 5 Mar 2021 13:38:35 +0000
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PGUL/fVldIoxWNj+dCeZWEcNQG9ZzVAw7e1+qXhsVuI=; b=my31I57KpgKgdpA65akD868zSfQxLv+oujmhp9UUdVro0H3vnVxEqpokox4zs5YdSlBY63hrXDvQSEnpBDcFXGabXEFZGbM6IMxblyFpUtFU05BeuiKo07FakAPPNDFoCn/MHTQnSAfE+6+HdxnlBTgQtpiZbNgA7Xtq3mp73b2erdWBsFUXfTBJ13WuxGc89I1HSgidQ/A/sXBro8pujVf5Z4qivgXA3qc1xyJwQ0wPLhgTV2wYp5aH+5fsK0QTlGmg0+4akmZEdfPA8eFfJzYyXzHlCpXFGLLaQzbbK+LUXUx0ymNR/ffn07QJioSxGH9y8X4s7HLzTgdsDRkwkg==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HArdjncKaiRjkJxFnWEJo/r1DlytVQzge66qivDq4907QJM/Uv8KiTDZlJ5R8RQbqggjVTfbUaWhckXnYmpcdCp5Z5jTz05v/h++UScwpukQnJ8Eruf5IHiTNuQsU2/Ps0HsYDSukGON7KCg/kjFoljz6xJ8dsVxqzP7vs7Dtzgee6xUNsY5//WLE9bxj8P2f01WeV1dmK2HWknOdHCM3GdwiNXiwZy+pr365FuS6Cu8UCN2MtyOUljM72+/m5NnOKgdwY/MnucUw+ndkWiMPUvIwsDRlLZSC1RW3RyKTvTeSghneh8JEq9kSvXvpIZJ4ulgCBbt4y2h3dXeFGydbQ==
- Authentication-results: esa3.hc3370-68.iphmx.com; dkim=pass (signature verified) header.i=@citrix.onmicrosoft.com
- Cc: Juergen Gross <jgross@xxxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, Ian Jackson <iwj@xxxxxxxxxxxxxx>
- Delivery-date: Fri, 05 Mar 2021 13:39:13 +0000
- Ironport-sdr: Np9k7AOFFUMllDBAU68I5EVK982G1YgzrCHuF/hryP9krIJNcdL2j5XZeT0z/ZnooD+tExliS6 B/g0E0pVFo74As/VEnocxMnj6WFDGxgFFgAlu7qo1lb7RXRKeYByQxkRxHD32LC5aTUyNFLF8m ycM3ZoWRAsAuebgNQ4hMOoGHXoDwUjuyYMFuUJxa5mMac8ygvllHVpeB40BrVJ7ekuQkZjo4f6 /R6w+SU1yG2UE9K/aAHzdvES22HA+kiXwaOHwcb/KOJc991xauXSV9iL97ZwBxKSVeMNdrCNmp h2k=
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
On 05/03/2021 12:49, Andrew Cooper wrote:
> c/s 4664034cd dropped the $(LIBHEADERSGLOB) dependency for the headers.chk
> rule, without replacing it.
>
> As headers.chk uses $^, a typical build looks like:
>
> andrewcoop@andrewcoop:/local/xen.git$ make -C tools/libs/devicemodel/
> make: Entering directory '/local/xen.git/tools/libs/devicemodel'
> for i in ; do \
> gcc -x c -ansi -Wall -Werror
> -I/local/xen.git/tools/libs/devicemodel/../../../tools/include \
> -S -o /dev/null $i || exit 1; \
> echo $i; \
> done >headers.chk.new
> mv headers.chk.new headers.chk
>
> i.e. with an empty for loop, and checking only the $(AUTOINCS).
>
> Reinsert a $(LIBHEADERS) dependency.
>
> Fixes: 4664034cd ("tools/libs: move official headers to common directory")
> Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
> ---
> CC: Juergen Gross <jgross@xxxxxxxx>
> CC: Roger Pau Monné <roger.pau@xxxxxxxxxx>
> CC: Wei Liu <wl@xxxxxxx>
Apologies - I totally messed up the CC list here.
For 4.15. Regression from 4.14, in some build-time checking logic.
~Andrew
> ---
> tools/libs/libs.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk
> index a68cec244c..2d973ccb95 100644
> --- a/tools/libs/libs.mk
> +++ b/tools/libs/libs.mk
> @@ -76,7 +76,7 @@ else
> .PHONY: headers.chk
> endif
>
> -headers.chk: $(AUTOINCS)
> +headers.chk: $(LIBHEADERS) $(AUTOINCS)
>
> headers.lst: FORCE
> @{ set -e; $(foreach h,$(LIBHEADERS),echo $(h);) } > $@.tmp
|