Author: hans Date: Tue Jan 17 15:47:58 2017 New Revision: 292270 URL: http://llvm.org/viewvc/llvm-project?rev=292270&view=rev Log: Merging r292255: ------------------------------------------------------------------------ r292255 | mgorny | 2017-01-17 13:04:19 -0800 (Tue, 17 Jan 2017) | 12 lines
[cmake] Update SOVERSION for the new versioning scheme Update SOVERSION to use just the major version number rather than major+minor, to match the new versioning scheme where only major is used to indicate API/ABI version. Since two-digit SOVERSIONs were introduced post 3.9 branching, this change does not risk any SOVERSION collisions. In the past, two-component X.Y SOVERSIONs were shortly used but those will not interfere with the new ones since the new versions start at 4. Differential Revision: https://reviews.llvm.org/D28730 ------------------------------------------------------------------------ Modified: llvm/branches/release_40/ (props changed) llvm/branches/release_40/cmake/modules/AddLLVM.cmake Propchange: llvm/branches/release_40/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 17 15:47:58 2017 @@ -1,3 +1,3 @@ /llvm/branches/Apple/Pertwee:110850,110961 /llvm/branches/type-system-rewrite:133420-134817 -/llvm/trunk:155241,291863,291875,292242 +/llvm/trunk:155241,291863,291875,292242,292255 Modified: llvm/branches/release_40/cmake/modules/AddLLVM.cmake URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/cmake/modules/AddLLVM.cmake?rev=292270&r1=292269&r2=292270&view=diff ============================================================================== --- llvm/branches/release_40/cmake/modules/AddLLVM.cmake (original) +++ llvm/branches/release_40/cmake/modules/AddLLVM.cmake Tue Jan 17 15:47:58 2017 @@ -462,11 +462,9 @@ function(llvm_add_library name) if(UNIX AND NOT APPLE AND NOT ARG_SONAME) set_target_properties(${name} PROPERTIES - # Concatenate the version numbers since ldconfig expects exactly - # one component indicating the ABI version, while LLVM uses - # major+minor for that. - SOVERSION ${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR} - VERSION ${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX}) + # Since 4.0.0, the ABI version is indicated by the major version + SOVERSION ${LLVM_VERSION_MAJOR} + VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX}) endif() endif() _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
