diff --git a/.gitignore b/.gitignore index 72ddb33..1150c55 100644 --- a/.gitignore +++ b/.gitignore @@ -139,3 +139,7 @@ /clang-tools-extra-11.1.0rc1.src.tar.xz /clang-tools-extra-11.1.0rc1.src.tar.xz.sig /clang-11.1.0rc1.src.tar.xz.sig +/clang-11.1.0rc2.src.tar.xz +/clang-tools-extra-11.1.0rc2.src.tar.xz +/clang-tools-extra-11.1.0rc2.src.tar.xz.sig +/clang-11.1.0rc2.src.tar.xz.sig diff --git a/D94941.diff b/D94941.diff deleted file mode 100644 index 2f68254..0000000 --- a/D94941.diff +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -509,7 +509,7 @@ - "${CLANG_VERSION_MAJOR}" CACHE STRING - "Major version number that will be appended to the clang executable name") - set(LIBCLANG_LIBRARY_VERSION -- "${CLANG_VERSION_MAJOR}" CACHE STRING -+ "${CLANG_VERSION_MAJOR}.${CLANG_VERSION_MINOR}" 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/tools/clang-shlib/CMakeLists.txt b/tools/clang-shlib/CMakeLists.txt ---- a/tools/clang-shlib/CMakeLists.txt -+++ b/tools/clang-shlib/CMakeLists.txt -@@ -48,3 +48,8 @@ - ${_OBJECTS} - LINK_LIBS - ${_DEPS}) -+ -+ set_target_properties(clang-cpp -+ PROPERTIES -+ VERSION ${LIBCLANG_LIBRARY_VERSION} -+ SOVERSION ${LIBCLANG_LIBRARY_VERSION}) -diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt ---- a/tools/libclang/CMakeLists.txt -+++ b/tools/libclang/CMakeLists.txt -@@ -150,6 +150,7 @@ - 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. - diff --git a/clang.spec b/clang.spec index 70d8c05..28f8265 100644 --- a/clang.spec +++ b/clang.spec @@ -3,8 +3,8 @@ %global maj_ver 11 %global min_ver 1 %global patch_ver 0 -%global rc_ver 1 -%global baserelease 2 +%global rc_ver 2 +%global baserelease 3 %global clang_tools_binaries \ %{_bindir}/clang-apply-replacements \ @@ -89,9 +89,6 @@ Patch4: 0002-gtest-reorg.patch Patch11: 0001-ToolChain-Add-lgcc_s-to-the-linker-flags-when-using-.patch Patch13: 0001-Make-funwind-tables-the-default-for-all-archs.patch -# Fix SONAME -Patch5: D94941.diff - # Not Upstream Patch15: 0001-clang-Don-t-install-static-libraries.patch Patch16: 0001-clang-Fix-spurious-test-failure.patch @@ -531,6 +528,9 @@ false %endif %changelog +* Fri Jan 22 2021 Serge Guelton - 11.1.0-0.3.rc2 +- 11.1.0-rc2 release + * Wed Jan 20 2021 Serge Guelton - 11.1.0-0.2.rc1 - rebuilt with https://reviews.llvm.org/D94941 applied. diff --git a/sources b/sources index 2df1880..e235efe 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (clang-11.1.0rc1.src.tar.xz) = b14c3cf52aabc2a6db48606d9db803a3ad5cce57988dedbbf97073638aa805eb1b0c51aac591a22dc346a4c2ee6d52aecd5068a82885556b67a674834c22cdea -SHA512 (clang-tools-extra-11.1.0rc1.src.tar.xz) = 6d0611471c1777eed8e172dcfa6258b76759a8eda5474562e9913b46dd8301c136db6169c91a0349739a89f0484958eda4132db5e3a59fb6d4ab2911d5a3ff53 -SHA512 (clang-tools-extra-11.1.0rc1.src.tar.xz.sig) = 5c96b1f02d5920183ba19a73da525860ca6ee90faa6e35f14f34708aadafb3e9f26cda309d47af132a4f1265ed20854c5fee63d12435932ce4f4ae3e98776657 -SHA512 (clang-11.1.0rc1.src.tar.xz.sig) = ed416013cae5a978aab6411f852a6551f25d1a5033a56ccdc4c61a111639136e56b21a32eb9e900faeae728b58fd37b2dd3f52ca06ae2ace83f4a21e2699e136 +SHA512 (clang-11.1.0rc2.src.tar.xz) = cae207e69b6d7df31303b1c73d55d82091babedbe0dc684aab1b603ce7e749d98a11a14ae9e3848dcb95a5840b38de56f407dda10b8b80eac3a6ce09ca44758a +SHA512 (clang-tools-extra-11.1.0rc2.src.tar.xz) = 462a15d571b0f7bb02641cf1ebfa8e510c6877839f6cdae48a8535ef481ec4ffdcf062fc7cfd8ea791bc4f8dff45f2104151cae6fa94d1091f995bcf8b87c0e5 +SHA512 (clang-tools-extra-11.1.0rc2.src.tar.xz.sig) = 7cb6632673c9739c87f1a8cc643e7f5583b52fc893d489d738216b423ceba6e97454323674cf0ee178e4141171d24eefc1b0786fad84efcb2bdb27d6033393b3 +SHA512 (clang-11.1.0rc2.src.tar.xz.sig) = 4921b2c4ef64c57d7135989349da8999b621c182362c0edabb23c67192052729afc9ba09888ee683cb10e39d5645250b1b62100c22ded8ac05f1ca0ba36b8e64