From 71239593ef4077b3e3d06a0f21aa5d0697880bef Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 20 Apr 2010 14:49:30 +0000 Subject: 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 Signed-off-by: Austin Foxley --- libc/Makefile.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libc') 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) -- cgit v1.2.3