From: Stanislav Fomichev <sdf@fomichev.me>
To: Jakub Kicinski <jakub.kicinski@netronome.com>
Cc: Stanislav Fomichev <sdf@google.com>,
netdev@vger.kernel.org, davem@davemloft.net, ast@kernel.org,
daniel@iogearbox.net, quentin.monnet@netronome.com
Subject: Re: [PATCH bpf] tools/bpf: properly account for libbfd variations
Date: Tue, 15 Jan 2019 13:47:11 -0800 [thread overview]
Message-ID: <20190115214711.GA726@mini-arch> (raw)
In-Reply-To: <20190115133800.658999bd@cakuba.netronome.com>
On 01/15, Jakub Kicinski wrote:
> On Tue, 15 Jan 2019 11:59:53 -0800, Stanislav Fomichev wrote:
> > On some platforms, in order to link against libbfd, we need to
> > link against liberty and even possibly libz. Account for that
> > in the bpftool Makefile. We now have proper feature detection
> > for each case, so handle each one separately.
> >
> > See recent commit 14541b1e7e72 ("perf build: Don't unconditionally link the
> > libbfd feature test to -liberty and -lz") where I fixed feature
> > detection.
> >
> > Fixes: 29a9c10e4110 ("bpftool: make libbfd optional")
> > Signed-off-by: Stanislav Fomichev <sdf@google.com>
>
> Minor nits below, in any case:
>
> Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
>
> Thanks for making bpftool build! :)
>
> > diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile
> > index 492f0f24e2d3..af9a25bf480d 100644
> > --- a/tools/bpf/bpftool/Makefile
> > +++ b/tools/bpf/bpftool/Makefile
> > @@ -92,10 +92,21 @@ BFD_SRCS = jit_disasm.c
> >
> > SRCS = $(filter-out $(BFD_SRCS),$(wildcard *.c))
> >
> > -ifeq ($(feature-libbfd),1)
> > +ifeq ($(feature-libbfd), 1)
>
> nit: no space there is more common
>
> $ git grep 'ifeq' | grep ',[^ ]' | wc -l
> 482
> $ git grep 'ifeq' | grep ', ' | wc -l
> 136
>
>
> > +LIBS += -lbfd -ldl -lopcodes
>
> nit: should this be indented?
>
> > +else
> > + ifeq ($(feature-libbfd-liberty), 1)
> > + LIBS += -lbfd -ldl -lopcodes -liberty
> > + else
> > + ifeq ($(feature-libbfd-liberty-z), 1)
> > + LIBS += -lbfd -ldl -lopcodes -liberty -lz
> > + endif
>
> Would this syntax:
>
> ifeq ($(feature-libbfd),1)
> LIBS += ..
> else ifeq ($(feature-libbfd-liberty),1)
> LIBS += ..
> else ifeq ($(feature-libbfd-liberty-z),1)
> LIBS += ..
> endif
>
> Not work?
I does seem to work :-) This is the first time I see it being written that
way. (but your link indeed shows that this syntax is supported)
I'll post v2 shortly with all the nits addressed. Thanks for a quick
review!
>
> https://www.gnu.org/software/make/manual/html_node/Conditional-Syntax.html
>
> I don't think I've ever tried, but looks more concise..
>
> > + endif
> > +endif
> > +
> > +ifneq ($(filter -lbfd,$(EXTLIBS)),)
> > CFLAGS += -DHAVE_LIBBFD_SUPPORT
> > SRCS += $(BFD_SRCS)
> > -LIBS += -lbfd -lopcodes
> > endif
> >
> > OBJS = $(patsubst %.c,$(OUTPUT)%.o,$(SRCS)) $(OUTPUT)disasm.o
>
next prev parent reply other threads:[~2019-01-15 21:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-15 19:59 [PATCH bpf] tools/bpf: properly account for libbfd variations Stanislav Fomichev
2019-01-15 21:38 ` Jakub Kicinski
2019-01-15 21:47 ` Stanislav Fomichev [this message]
2019-01-15 21:52 ` [PATCH bpf v2] " Stanislav Fomichev
2019-01-15 21:55 ` Jakub Kicinski
2019-01-15 22:00 ` Stanislav Fomichev
2019-01-15 22:03 ` [PATCH bpf v3] " Stanislav Fomichev
2019-01-15 22:06 ` Jakub Kicinski
2019-01-15 23:55 ` Daniel Borkmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190115214711.GA726@mini-arch \
--to=sdf@fomichev.me \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=jakub.kicinski@netronome.com \
--cc=netdev@vger.kernel.org \
--cc=quentin.monnet@netronome.com \
--cc=sdf@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).