From patchwork Sat Oct 23 20:51:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Monnet X-Patchwork-Id: 12579831 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD731C433EF for ; Sat, 23 Oct 2021 20:52:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 96B9A60EE3 for ; Sat, 23 Oct 2021 20:52:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231349AbhJWUy2 (ORCPT ); Sat, 23 Oct 2021 16:54:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231213AbhJWUyW (ORCPT ); Sat, 23 Oct 2021 16:54:22 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC8F5C061348 for ; Sat, 23 Oct 2021 13:52:02 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id w15so971023wra.3 for ; Sat, 23 Oct 2021 13:52:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=isovalent-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=N1WVOZzTNh/27joMu9FrakmExxycTJXl4iU2zUCXEpI=; b=E7mTjdCnzNu7fTtcv4huP0x9ptCPFwdMYkzVsiL4s8m/XOsFU+EBFV5Coz9i4d1Y2N P95uGIg/MYsv/4B9ObjDV14Xiw6VM/KMt0Wi01LZrjRiwwi9giNxORWzNyebpHfi0jZp gq3wjtPBuhqfn5FPNBsXlUboOeDu9y2mENvijmAP2dKdNuj/xLxhZ14+WzFeYBHRYb50 cWetwT6G3yulvPOwtplL8npUXV/Ifzjay8fEpeZect3AAP9ouAzxN4/sPMN491SIgNqW QZAHadUnofP4WIaXfDh/g44dPPqaXzFviRhMGcVYIWB8J1z6dMLh9Y76Ze4kyVKuVgVS olqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=N1WVOZzTNh/27joMu9FrakmExxycTJXl4iU2zUCXEpI=; b=Ef/OUQi/3fAfFETtYl7gEFwjneyVInozfqJuUaAZAXwzy/jk+9gAA2JCgAq/pSPvQ7 H9lxSUxvYJhP8AlQOOuey8PvhISs/FQLwg9lu56sDKweWp1G34SR8joEZST/n4jVO344 z9U9VSpFG4HjdhZe4OukarwI/833sL5f18HzbxgaMv57LtQncadmzK/J4Hk9buuwqca0 Q8yZhHlC8rfd3iT46wBxgmbyeO+KvpS6aKb+c4CG/+v5TlGHlxijXAyw36EfSc4ZGSIK If8gz676wraWcVjtj9hDvLtqI2GjXdafVJ/aXFy4+ZBn8EtZBrK7nBTZGdVWMSHWZqNp majw== X-Gm-Message-State: AOAM533786cJnvz6+DIGUExQPxfq4hAcEiWraUB4IJSnFRrwF6Ojmrsy scD9t0Ctwx5S9PR28zi8KbGTlw== X-Google-Smtp-Source: ABdhPJwVr4UelzHEpzNVZSRpeOp+gjTZlDra/SRPpPPRcdidctBXC/zlPYvlymlifHu4rlDEQS9/2A== X-Received: by 2002:adf:edd2:: with SMTP id v18mr10309607wro.104.1635022321571; Sat, 23 Oct 2021 13:52:01 -0700 (PDT) Received: from localhost.localdomain ([149.86.74.50]) by smtp.gmail.com with ESMTPSA id u16sm13555398wmc.21.2021.10.23.13.52.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Oct 2021 13:52:01 -0700 (PDT) From: Quentin Monnet To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, Quentin Monnet Subject: [PATCH bpf-next v2 1/5] bpftool: Remove Makefile dep. on $(LIBBPF) for $(LIBBPF_INTERNAL_HDRS) Date: Sat, 23 Oct 2021 21:51:50 +0100 Message-Id: <20211023205154.6710-2-quentin@isovalent.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211023205154.6710-1-quentin@isovalent.com> References: <20211023205154.6710-1-quentin@isovalent.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net The dependency is only useful to make sure that the $(LIBBPF_HDRS_DIR) directory is created before we try to install locally the required libbpf internal header. Let's create this directory properly instead. This is in preparation of making $(LIBBPF_INTERNAL_HDRS) a dependency to the bootstrap bpftool version, in which case we want no dependency on $(LIBBPF). Signed-off-by: Quentin Monnet --- tools/bpf/bpftool/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile index 098d762e111a..939b0fca5fb9 100644 --- a/tools/bpf/bpftool/Makefile +++ b/tools/bpf/bpftool/Makefile @@ -39,14 +39,14 @@ ifeq ($(BPFTOOL_VERSION),) BPFTOOL_VERSION := $(shell make -rR --no-print-directory -sC ../../.. kernelversion) endif -$(LIBBPF_OUTPUT) $(BOOTSTRAP_OUTPUT) $(LIBBPF_BOOTSTRAP_OUTPUT): +$(LIBBPF_OUTPUT) $(BOOTSTRAP_OUTPUT) $(LIBBPF_BOOTSTRAP_OUTPUT) $(LIBBPF_HDRS_DIR): $(QUIET_MKDIR)mkdir -p $@ $(LIBBPF): $(wildcard $(BPF_DIR)/*.[ch] $(BPF_DIR)/Makefile) | $(LIBBPF_OUTPUT) $(Q)$(MAKE) -C $(BPF_DIR) OUTPUT=$(LIBBPF_OUTPUT) \ DESTDIR=$(LIBBPF_DESTDIR) prefix= $(LIBBPF) install_headers -$(LIBBPF_INTERNAL_HDRS): $(LIBBPF_HDRS_DIR)/%.h: $(BPF_DIR)/%.h $(LIBBPF) +$(LIBBPF_INTERNAL_HDRS): $(LIBBPF_HDRS_DIR)/%.h: $(BPF_DIR)/%.h | $(LIBBPF_HDRS_DIR) $(call QUIET_INSTALL, $@) $(Q)install -m 644 -t $(LIBBPF_HDRS_DIR) $<