diff options
author | Natanael Copa <natanael.copa@gmail.com> | 2010-04-20 14:49:30 +0000 |
---|---|---|
committer | Austin Foxley <austinf@cetoncorp.com> | 2010-04-22 08:39:36 -0700 |
commit | 71239593ef4077b3e3d06a0f21aa5d0697880bef (patch) | |
tree | f427be26877fe959237681bc2e793ac59d4e37fc /libc/Makefile.in | |
parent | 2520b17c292af534decee7fba76865520ea9727c (diff) |
nptl: proper soname handling
Since sublevel releases are not ABI compatible we need to adjust
the soname to include the sublevel version.
This makes it possible to install ABI incompatible versions of the
library side by side so clean upgrades are possible.
Signed-off-by: Natanael Copa <natanael.copa@gmail.com>
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libc/Makefile.in')
-rw-r--r-- | libc/Makefile.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libc/Makefile.in b/libc/Makefile.in index ff3e5c31d..37eaa65eb 100644 --- a/libc/Makefile.in +++ b/libc/Makefile.in @@ -21,7 +21,7 @@ CFLAGS += -D__USE_STDIO_FUTEXES__ endif LIBS-libc.so := $(interp) $(ldso) $(top_builddir)lib/$(NONSHARED_LIBNAME) -# we have SHARED_MAJORNAME=libc.so.$(MAJOR_VERSION) defined in Rules.mak +# we have SHARED_LIBNAME=libc.so.$(ABI_VERSION) defined in Rules.mak libc_FULL_NAME := libuClibc-$(VERSION).so # this comes first, so duplicate removal works correctly @@ -60,18 +60,18 @@ OUTPUT_FORMAT = $(CC) $(CFLAGS) -Wl,--verbose 2>&1 | $(SED) -n '/OUTPUT_FORMAT/, ifeq ($(DOMULTI),n) $(libc.depend): $(libc_OUT)/libc_so.a $(LIBS-libc.so) - $(call link.so,$(libc_FULL_NAME),$(MAJOR_VERSION)) + $(call link.so,$(libc_FULL_NAME),$(ABI_VERSION)) else $(libc.depend): $(libc_OUT)/libc.oS $(libc-nomulti-y:.o=.oS) | $(LIBS-libc.so) - $(call linkm.so,$(libc_FULL_NAME),$(MAJOR_VERSION)) + $(call linkm.so,$(libc_FULL_NAME),$(ABI_VERSION)) endif $(Q)$(RM) $@ $(Q)cp $(top_srcdir)extra/scripts/format.lds $@ $(Q)$(OUTPUT_FORMAT) >> $@ ifeq ($(COMPAT_ATEXIT),y) - $(Q)echo "GROUP ( $(NONSHARED_LIBNAME) $(SHARED_MAJORNAME) $(ASNEEDED) )" >> $@ + $(Q)echo "GROUP ( $(NONSHARED_LIBNAME) $(SHARED_LIBNAME) $(ASNEEDED) )" >> $@ else - $(Q)echo "GROUP ( $(SHARED_MAJORNAME) $(NONSHARED_LIBNAME) $(ASNEEDED) )" >> $@ + $(Q)echo "GROUP ( $(SHARED_LIBNAME) $(NONSHARED_LIBNAME) $(ASNEEDED) )" >> $@ endif $(libc_OUT)/libc_so.a: $(libc-so-y) | $(top_builddir)lib/libc.a $(top_builddir)lib/$(NONSHARED_LIBNAME) |