From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D0EFC54EED for ; Tue, 24 Jan 2023 23:05:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233900AbjAXXFF (ORCPT ); Tue, 24 Jan 2023 18:05:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229879AbjAXXFE (ORCPT ); Tue, 24 Jan 2023 18:05:04 -0500 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B04984AA63; Tue, 24 Jan 2023 15:05:02 -0800 (PST) Received: by mail-ej1-x62c.google.com with SMTP id vw16so43131833ejc.12; Tue, 24 Jan 2023 15:05:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:from:to:cc:subject:date:message-id:reply-to; bh=LFmKISUEP4KMKksliNnDW8AAbwgCUx4p8IWA7pxHiq8=; b=pYl9Sv/vilxPNHDWR0TOktdrbscAf7wTpiE/As+ZQ+8c2it13bdNN7Ddyk+Y7JI1oQ QVVyf4ZME0aXFz+NUUphEnBxEOObUuOeJgZGqRWa+7FOgDJM8rJ41sdw/LHgtnfTAArO /iuFRe3off73GWeK7x6LwojsnO+jbwf0fycgy5Z4y68oNfPA8NZzBy9QJkrlz+Fpkh7L Kkg3ji3izc5KkKHh/ZRgmM0r2ce11j7xfqMKPVXGO92YA5iwo9fxze5ZRjOMfzAtCIL4 fzVMf/xgJTG9/G9gxQtv2oGtXigJTQFN9smWwKM6ZiAx/nUJKc5xBgI5BWBHgiJJiiBr ADXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=LFmKISUEP4KMKksliNnDW8AAbwgCUx4p8IWA7pxHiq8=; b=zuKehliS+DoQol3uXzohXlg3G4vN9nD19hAHYedtlO8vjXhX6LvBpRn8ziq7X24+kw bqTeHMN+Ir4Z0VzTeWIuTa2nTcO1l/VsXrifS5SkHvCXY2N8sEk2HwWMIijdoupRBwAI QmkNPhkTnpdawahe/A7GGozXHy6fGuli2N0nK/gMdhVsTm5eB8fexL2ZlW/gQJurSkdw /+cRcPZqZtARfFzeosXP+rZZ5DrM0Kyz1s5Vol7qNw/FsvSLYwMII3UytscR9d7+rVJC fsnYQsfAbwaZgMOcdQqxoj8VPwSPsGhH3QQ1AHVVqumIolrjPshNdIe/OcoznTw8W0bU f/Cw== X-Gm-Message-State: AFqh2kqXJfx9tmuwxUn6GX/6gFJOjWN8tHjkhDfZfWMlsk4OIWdLIM2J raA/woQpC3iE7+eKmtK+Ifk= X-Google-Smtp-Source: AMrXdXveaCF5SJskLiomc3lMHSStv0NhioAVOI3d2VT+5OEGZYo9xjWAP63yTJ42xtolAElwMtrbtg== X-Received: by 2002:a17:906:2308:b0:870:709e:169d with SMTP id l8-20020a170906230800b00870709e169dmr32337303eja.35.1674601500929; Tue, 24 Jan 2023 15:05:00 -0800 (PST) Received: from krava ([83.240.61.48]) by smtp.gmail.com with ESMTPSA id p16-20020a1709060e9000b008779570227bsm1464215ejf.112.2023.01.24.15.04.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 15:05:00 -0800 (PST) From: Jiri Olsa X-Google-Original-From: Jiri Olsa Date: Wed, 25 Jan 2023 00:04:57 +0100 To: Ian Rogers Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Connor OBrien , Nathan Chancellor , Kumar Kartikeya Dwivedi , bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v4 1/2] tools/resolve_btfids: Install subcmd headers Message-ID: References: <20230124064324.672022-1-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230124064324.672022-1-irogers@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jan 23, 2023 at 10:43:23PM -0800, Ian Rogers wrote: > Previously tools/lib/subcmd was added to the include path, switch to > installing the headers and then including from that directory. This > avoids dependencies on headers internal to tools/lib/subcmd. Add the > missing subcmd directory to the affected #include. > > Signed-off-by: Ian Rogers Acked-by: iri Olsa jirka > --- > tools/bpf/resolve_btfids/Makefile | 19 ++++++++++++++----- > tools/bpf/resolve_btfids/main.c | 2 +- > 2 files changed, 15 insertions(+), 6 deletions(-) > > diff --git a/tools/bpf/resolve_btfids/Makefile b/tools/bpf/resolve_btfids/Makefile > index f7375a119f54..1fe0082b2ecc 100644 > --- a/tools/bpf/resolve_btfids/Makefile > +++ b/tools/bpf/resolve_btfids/Makefile > @@ -35,21 +35,29 @@ SUBCMD_SRC := $(srctree)/tools/lib/subcmd/ > BPFOBJ := $(OUTPUT)/libbpf/libbpf.a > LIBBPF_OUT := $(abspath $(dir $(BPFOBJ)))/ > SUBCMDOBJ := $(OUTPUT)/libsubcmd/libsubcmd.a > +SUBCMD_OUT := $(abspath $(dir $(SUBCMDOBJ)))/ > > LIBBPF_DESTDIR := $(LIBBPF_OUT) > LIBBPF_INCLUDE := $(LIBBPF_DESTDIR)include > > +SUBCMD_DESTDIR := $(SUBCMD_OUT) > +SUBCMD_INCLUDE := $(SUBCMD_DESTDIR)include > + > BINARY := $(OUTPUT)/resolve_btfids > BINARY_IN := $(BINARY)-in.o > > all: $(BINARY) > > +prepare: $(BPFOBJ) $(SUBCMDOBJ) > + > $(OUTPUT) $(OUTPUT)/libsubcmd $(LIBBPF_OUT): > $(call msg,MKDIR,,$@) > $(Q)mkdir -p $(@) > > $(SUBCMDOBJ): fixdep FORCE | $(OUTPUT)/libsubcmd > - $(Q)$(MAKE) -C $(SUBCMD_SRC) OUTPUT=$(abspath $(dir $@))/ $(abspath $@) > + $(Q)$(MAKE) -C $(SUBCMD_SRC) OUTPUT=$(SUBCMD_OUT) \ > + DESTDIR=$(SUBCMD_DESTDIR) prefix= \ > + $(abspath $@) install_headers > > $(BPFOBJ): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(LIBBPF_OUT) > $(Q)$(MAKE) $(submake_extras) -C $(LIBBPF_SRC) OUTPUT=$(LIBBPF_OUT) \ > @@ -63,7 +71,7 @@ CFLAGS += -g \ > -I$(srctree)/tools/include \ > -I$(srctree)/tools/include/uapi \ > -I$(LIBBPF_INCLUDE) \ > - -I$(SUBCMD_SRC) \ > + -I$(SUBCMD_INCLUDE) \ > $(LIBELF_FLAGS) > > LIBS = $(LIBELF_LIBS) -lz > @@ -71,7 +79,7 @@ LIBS = $(LIBELF_LIBS) -lz > export srctree OUTPUT CFLAGS Q > include $(srctree)/tools/build/Makefile.include > > -$(BINARY_IN): $(BPFOBJ) fixdep FORCE | $(OUTPUT) > +$(BINARY_IN): fixdep FORCE prepare | $(OUTPUT) > $(Q)$(MAKE) $(build)=resolve_btfids > > $(BINARY): $(BPFOBJ) $(SUBCMDOBJ) $(BINARY_IN) > @@ -83,7 +91,8 @@ clean_objects := $(wildcard $(OUTPUT)/*.o \ > $(OUTPUT)/.*.o.d \ > $(LIBBPF_OUT) \ > $(LIBBPF_DESTDIR) \ > - $(OUTPUT)/libsubcmd \ > + $(SUBCMD_OUT) \ > + $(SUBCMD_DESTDIR) \ > $(OUTPUT)/resolve_btfids) > > ifneq ($(clean_objects),) > @@ -100,4 +109,4 @@ tags: > > FORCE: > > -.PHONY: all FORCE clean tags > +.PHONY: all FORCE clean tags prepare > diff --git a/tools/bpf/resolve_btfids/main.c b/tools/bpf/resolve_btfids/main.c > index 80cd7843c677..77058174082d 100644 > --- a/tools/bpf/resolve_btfids/main.c > +++ b/tools/bpf/resolve_btfids/main.c > @@ -75,7 +75,7 @@ > #include > #include > #include > -#include > +#include > > #define BTF_IDS_SECTION ".BTF_ids" > #define BTF_ID "__BTF_ID__" > -- > 2.39.0.246.g2a6d74b583-goog >