From: Tom Stellard <tstellar@redhat.com>
Date: Thu, 21 Jan 2021 19:35:48 +0000 (-0800)
Subject: [PATCH] Add minor version to libclang.so and libclang-cpp.so SONAME
X-Git-Tag: archive/raspbian/1%11.1.0-4+rpi1^2~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=58095e48ccb593a97df6f9c6069dbdb0a2fdd89c;p=llvm-toolchain-11.git

[PATCH] Add minor version to libclang.so and libclang-cpp.so SONAME

This patch is for the release/11.x branch.  We need to bump the SONAME, because
the ABI of the shared library is changing

Reviewed By: sylvestre.ledru, cuviper

Differential Revision: https://reviews.llvm.org/D94941

Gbp-Pq: Name 0001-Add-minor-version-to-libclang.so-and-libclang-cpp.so.patch
---

diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
index bb4b801f0..2e06c5fd9 100644
--- a/clang/CMakeLists.txt
+++ b/clang/CMakeLists.txt
@@ -509,7 +509,7 @@ set(CLANG_EXECUTABLE_VERSION
     "${CLANG_VERSION_MAJOR}" CACHE STRING
     "Major version number that will be appended to the clang executable name")
 set(LIBCLANG_LIBRARY_VERSION
-    "${CLANG_VERSION_MAJOR}.${CLANG_VERSION_MINOR}" CACHE STRING
+    "${CLANG_VERSION_MAJOR}" CACHE STRING
     "Major version number that will be appended to the libclang library")
 mark_as_advanced(CLANG_EXECUTABLE_VERSION LIBCLANG_LIBRARY_VERSION)
 
diff --git a/clang/tools/clang-shlib/CMakeLists.txt b/clang/tools/clang-shlib/CMakeLists.txt
index 47ff80418..5949223fc 100644
--- a/clang/tools/clang-shlib/CMakeLists.txt
+++ b/clang/tools/clang-shlib/CMakeLists.txt
@@ -48,8 +48,3 @@ add_clang_library(clang-cpp
                   ${_OBJECTS}
                   LINK_LIBS
                   ${_DEPS})
-
-    set_target_properties(clang-cpp
-      PROPERTIES
-      VERSION ${LIBCLANG_LIBRARY_VERSION}
-      SOVERSION ${LIBCLANG_LIBRARY_VERSION})
diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt
index 195ed5b6f..512e0ceee 100644
--- a/clang/tools/libclang/CMakeLists.txt
+++ b/clang/tools/libclang/CMakeLists.txt
@@ -150,7 +150,6 @@ if(ENABLE_SHARED)
   else()
     set_target_properties(libclang
       PROPERTIES
-      SOVERSION ${LIBCLANG_LIBRARY_VERSION}
       VERSION ${LIBCLANG_LIBRARY_VERSION}
       DEFINE_SYMBOL _CINDEX_LIB_)
     # FIXME: _CINDEX_LIB_ affects dllexport/dllimport on Win32.