From patchwork Sun Oct 11 19:24:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 1380436 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sipsolutions.net Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=AWFZmaJK; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C8WxQ4xxJz9sSC for ; Mon, 12 Oct 2020 06:25:42 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=ulxkinA4o+YaVDfdpQbrTphbG09OQdAj5zxbmnc6HJQ=; b=AWFZmaJK/T31PqLkaxHq/K3GLt 1SOnPbShkWdZNaKacfiIT24dyniGSn9eHcA78gXPsPiaq1hkd50Hz8ZK6I+/6Wihe3XkSZYwXwpZB ddNLCrmzmbtOjDI7sUo9w6h6p8Pn3kJhsUYlBxhlr5W4Q+k3m4oF0DnKc1rcy5IdO/PreJ2nMTS5h 9w9JQTuQ+NpFI/BoV/wRgpDfmGHMWv9ZzQqIdEnt0gr2KJCYf5fYA0bEPqcE8hOzY080nouRye/yc MBxa88u6QgVoEImZPbOcs5CvaMA43CwP9vzR6JO9bU570oEyhAM8ARf+a9R9W2XDcoLA3k399dIa+ YFzsTwhQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kRgxf-0008Fg-Gv; Sun, 11 Oct 2020 19:24:51 +0000 Received: from s3.sipsolutions.net ([2a01:4f8:191:4433::2] helo=sipsolutions.net) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kRgxd-0008FK-6r for hostap@lists.infradead.org; Sun, 11 Oct 2020 19:24:50 +0000 Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94) (envelope-from ) id 1kRgxU-003fhL-OJ; Sun, 11 Oct 2020 21:24:40 +0200 From: Johannes Berg To: hostap@lists.infradead.org Subject: [PATCH] build: fix dependency file inclusion Date: Sun, 11 Oct 2020 21:24:34 +0200 Message-Id: <1602444274-I82fb3a7c2fabf91edea3d5e5052d0fe11ec41137@changeid> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201011_152449_295048_3DD93E70 X-CRM114-Status: GOOD ( 14.09 ) X-Spam-Score: 0.4 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.4 KHOP_HELO_FCRDNS Relay HELO differs from its IP's reverse DNS X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johannes Berg Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Johannes Berg The objs.mk include changes for archive files broke things completely and none of the dependency files (*.d) ever got included, as the expansion there ended up empty. Clearly, my mistake, I should've tested that better. As we don't need the %.a files in the list there use filter-out to remove them, rather than what I had lazily wanted to do, which was trying to read %.d files for them. The filter-out actually works, and avoids looking up files that can never exist in the first place. Fixes: 87098d3324e0 ("build: Put archive files into build/ folder too") Signed-off-by: Johannes Berg --- src/objs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/objs.mk b/src/objs.mk index 54e42e6999df..a3040b21bd94 100644 --- a/src/objs.mk +++ b/src/objs.mk @@ -1,3 +1,3 @@ $(_OBJS_VAR) := $(call BUILDOBJ,$($(_OBJS_VAR))) --include $($($(_OBJS_VAR):%.o=%.d):%.a=%.d) +-include $(filter-out %.a,$($(_OBJS_VAR):%.o=%.d)) _DIRS += $(dir $($(_OBJS_VAR)))