On Mon, Jan 23, 2023 at 12:37 PM Daniel Borkmann <daniel@xxxxxxxxxxxxx> wrote:
>
> On 1/19/23 7:31 PM, 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 <irogers@xxxxxxxxxx>
> > ---
> > 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 19a3112e271a..76b737b2560d 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) \
> > @@ -60,14 +68,14 @@ CFLAGS += -g \
> > -I$(srctree)/tools/include \
> > -I$(srctree)/tools/include/uapi \
> > -I$(LIBBPF_INCLUDE) \
> > - -I$(SUBCMD_SRC)
> > + -I$(SUBCMD_INCLUDE)
> >
> > LIBS = -lelf -lz
> >
>
> This series needs a rebase against bpf-next, given it results in merge conflict
> e.g. see commit 0e43662e61f2 ("tools/resolve_btfids: Use pkg-config to locate
> libelf") from Dec 15th.
>
> Thanks,
> Daniel
Thanks, rebased onto bpf-next/master in v4:
https://lore.kernel.org/lkml/20230124064324.672022-2-irogers@xxxxxxxxxx/
Ian
