From: Daniel Borkmann <daniel@iogearbox.net>
To: Stanislav Fomichev <sdf@fomichev.me>
Cc: ast@kernel.org, sdf@google.com, bpf@vger.kernel.org,
netdev@vger.kernel.org
Subject: Re: [PATCH bpf 1/2] bpf, libbpf: fix version info and add it to shared object
Date: Sat, 23 Mar 2019 01:19:08 +0100 [thread overview]
Message-ID: <d3d082da-e542-036e-c545-6cde254cda3f@iogearbox.net> (raw)
In-Reply-To: <20190323000938.GV7431@mini-arch.hsd1.ca.comcast.net>
On 03/23/2019 01:09 AM, Stanislav Fomichev wrote:
> On 03/23, Daniel Borkmann wrote:
[...]
>> +$(OUTPUT)libbpf.so.$(LIBBPF_VERSION): $(BPF_IN)
>> + $(QUIET_LINK)$(CC) --shared -Wl,-soname,libbpf.so.$(LIBBPF_VERSION) \
> Shouldn't it be -soname,libbpf.so.$(VERSION) ?
The above is generating libbpf.so.0.0.2, and with the below two we generate
symlinks to it. libbpf.so.$(VERSION) would result in libbpf.so.0 otherwise
which we want to be a symlink instead. The workflow I've been following is
similar to fe316723a810 ("tools lib traceevent: Add version for traceevent
shared object").
>> + -Wl,--version-script=$(VERSION_SCRIPT) $^ -o $@
>> + @ln -sf $(@F) $(OUTPUT)libbpf.so
>> + @ln -sf $(@F) $(OUTPUT)libbpf.so.$(VERSION)
>>
>> $(OUTPUT)libbpf.a: $(BPF_IN)
>> $(QUIET_LINK)$(RM) $@; $(AR) rcs $@ $^
>> @@ -192,6 +199,12 @@ check_abi: $(OUTPUT)libbpf.so
>> exit 1; \
>> fi
>>
>> +define do_install_mkdir
>> + if [ ! -d '$(DESTDIR_SQ)$1' ]; then \
>> + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$1'; \
>> + fi
>> +endef
>> +
>> define do_install
>> if [ ! -d '$(DESTDIR_SQ)$2' ]; then \
>> $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \
>> @@ -200,8 +213,9 @@ define do_install
>> endef
>>
>> install_lib: all_cmd
>> - $(call QUIET_INSTALL, $(LIB_FILE)) \
>> - $(call do_install,$(LIB_FILE),$(libdir_SQ))
>> + $(call QUIET_INSTALL, $(LIB_TARGET)) \
>> + $(call do_install_mkdir,$(libdir_SQ)); \
>> + cp -fpR $(LIB_FILE) $(DESTDIR)$(libdir_SQ)
>>
>> install_headers:
>> $(call QUIET_INSTALL, headers) \
>> @@ -219,7 +233,7 @@ config-clean:
>>
>> clean:
>> $(call QUIET_CLEAN, libbpf) $(RM) $(TARGETS) $(CXX_TEST_TARGET) \
>> - *.o *~ *.a *.so .*.d .*.cmd LIBBPF-CFLAGS
>> + *.o *~ *.a *.so *.so.$(VERSION) .*.d .*.cmd LIBBPF-CFLAGS
> What about libbpf.so.$(LIBBPF_VERSION) ?
That is already cleaned via $(TARGETS), so this is taken care of.
>> $(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP.libbpf
>>
>>
>> --
>> 2.9.5
>>
next prev parent reply other threads:[~2019-03-23 0:19 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-22 23:47 [PATCH bpf 0/2] libbpf fix up and clarify version info Daniel Borkmann
2019-03-22 23:47 ` [PATCH bpf 1/2] bpf, libbpf: fix version info and add it to shared object Daniel Borkmann
2019-03-23 0:09 ` Stanislav Fomichev
2019-03-23 0:19 ` Daniel Borkmann [this message]
2019-03-23 0:28 ` Stanislav Fomichev
2019-03-23 0:38 ` Daniel Borkmann
2019-03-22 23:47 ` [PATCH bpf 2/2] bpf, libbpf: clarify bump in libbpf version info 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=d3d082da-e542-036e-c545-6cde254cda3f@iogearbox.net \
--to=daniel@iogearbox.net \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sdf@fomichev.me \
--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).