Commit 6bed7521 authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r208721: 

------------------------------------------------------------------------
r208721 | thomas.stellard | 2014-05-13 15:37:03 -0400 (Tue, 13 May 2014) | 11 lines

autoconf: Fix soname for libLLVM-Major.Minor.so (2nd try)

We were using libLLVM-Major.Minor.Patch.so for the soname, but we
need the soname to stay consistent for all Major.Minor.* releases
otherwise operating system distributors  will need to rebuild all
packages that link with LLVM every time there is a new point release.

This patch also reverses the compatibility symlink, so
libLLVM-Major.Minor.Patch.so is now a symlink that points
to libLLVM-Major-Minor.so.

------------------------------------------------------------------------

llvm-svn: 208829
parent b91c11da

llvm/Makefile.rules

+12 −3
Original line number Diff line number Diff line
@@ -1027,8 +1027,9 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) 
LLVMLibsOptions += -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc \

                   -L $(SharedLibDir)

endif

LLVMLibsOptions += -lLLVM-$(LLVMVersion)

LLVMLibsPaths += $(SharedLibDir)/$(SharedPrefix)LLVM-$(LLVMVersion)$(SHLIBEXT)

LLVM_SO_NAME = LLVM-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(LLVM_VERSION_SUFFIX)

LLVMLibsOptions += -l$(LLVM_SO_NAME)

LLVMLibsPaths += $(SharedLibDir)/$(SharedPrefix)$(LLVM_SO_NAME)$(SHLIBEXT)

else



ifndef NO_LLVM_CONFIG
@@ -1144,7 +1145,12 @@ LibName.O := $(LibDir)/$(LIBRARYNAME).o 
#---------------------------------------------------------

ifdef SHARED_LIBRARY



all-local:: $(LibName.SO)

all-local:: $(AliasName.SO)



$(AliasName.SO): $(LibName.SO)

ifdef SHARED_ALIAS

	$(Verb) $(AliasTool) $(BaseLibName.SO) $(AliasName.SO)

endif



ifdef EXPORTED_SYMBOL_FILE

$(LibName.SO): $(NativeExportsFile)
@@ -1202,6 +1208,9 @@ endif 
uninstall-local::

	$(Echo) Uninstalling $(BuildMode) Shared Library $(DestSharedLib)

	-$(Verb) $(RM) -f $(DestSharedLib)

ifdef SHARED_ALIAS

	-$(Verb) $(RM) -f $(DestSharedAlias)

endif

endif

endif

llvm/tools/llvm-shlib/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 


LEVEL := ../..



LIBRARYNAME = LLVM-$(LLVMVersion)

LIBRARYALIASNAME = LLVM-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(LLVM_VERSION_SUFFIX)

LIBRARYNAME = LLVM-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(LLVM_VERSION_SUFFIX)

LIBRARYALIASNAME = LLVM-$(LLVMVersion)



NO_BUILD_ARCHIVE := 1

LINK_LIBS_IN_SHARED := 1