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
>>
