Guest User

Untitled

a guest
Nov 24th, 2015
138
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.11 KB | None | 0 0
  1. Description: build: Set soabi for the combined shared library
  2. Currently the build for the combined shared library does not set
  3. any ABI version. Since this deviates from upstream we start with
  4. version 0.
  5. Probably it would be ok if upstream kept individual ABI versions
  6. for each individual library. Then the combined one would have to
  7. be incremented whenever any of those changes version.
  8. Though to me it would feel more logical if there would be only
  9. one ABI version for the whole set.
  10. Forwarded: Not yet. Needs discussion about library versioning.
  11. Author: Stefan Bader <[email protected]>
  12. Last-Update: 2015-08-12
  13.  
  14. Index: dpdk-2.0.0/mk/rte.sharelib.mk
  15. ===================================================================
  16. --- dpdk-2.0.0.orig/mk/rte.sharelib.mk 2015-04-03 16:13:45.000000000 +0200
  17. +++ dpdk-2.0.0/mk/rte.sharelib.mk 2015-06-12 10:34:56.901804534 +0200
  18. @@ -33,10 +33,12 @@ include $(RTE_SDK)/mk/internal/rte.build
  19.  
  20. # VPATH contains at least SRCDIR
  21. VPATH += $(SRCDIR)
  22. +# The shared libs abi number.
  23. +LIBABIVER := 0
  24.  
  25. ifeq ($(RTE_BUILD_COMBINE_LIBS),y)
  26. ifeq ($(RTE_BUILD_SHARED_LIB),y)
  27. -LIB_ONE := lib$(RTE_LIBNAME).so
  28. +LIB_ONE := lib$(RTE_LIBNAME).so.$(LIBABIVER)
  29. else
  30. LIB_ONE := lib$(RTE_LIBNAME).a
  31. endif
  32. @@ -51,10 +53,10 @@ ifeq ($(LINK_USING_CC),1)
  33. # Override the definition of LD here, since we're linking with CC
  34. LD := $(CC) $(CPU_CFLAGS)
  35. O_TO_S = $(LD) $(call linkerprefix,$(CPU_LDFLAGS)) \
  36. - -shared $(OBJS) -o $(RTE_OUTPUT)/lib/$(LIB_ONE)
  37. + -shared $(OBJS) -Wl,-soname,$(LIB_ONE) -o $(RTE_OUTPUT)/lib/$(LIB_ONE)
  38. else
  39. O_TO_S = $(LD) $(CPU_LDFLAGS) \
  40. - -shared $(OBJS) -o $(RTE_OUTPUT)/lib/$(LIB_ONE)
  41. + -shared $(OBJS) -Wl,-soname,$(LIB_ONE) -o $(RTE_OUTPUT)/lib/$(LIB_ONE)
  42. endif
  43.  
  44. O_TO_S_STR = $(subst ','\'',$(O_TO_S)) #'# fix syntax highlight
  45. @@ -80,6 +82,8 @@ ifeq ($(RTE_BUILD_SHARED_LIB),y)
  46. $(LIB_ONE): FORCE
  47. @[ -d $(dir $@) ] || mkdir -p $(dir $@)
  48. $(O_TO_S_DO)
  49. + @[ -L $(RTE_OUTPUT)/lib/$(basename $(LIB_ONE)) ] || \
  50. + ln -s $(LIB_ONE) $(RTE_OUTPUT)/lib/$(basename $(LIB_ONE))
  51. else
  52. $(LIB_ONE): FORCE
  53. @[ -d $(dir $@) ] || mkdir -p $(dir $@)
Advertisement
Add Comment
Please, Sign In to add comment