Remove abi_revision handling
We no longer ship RCs in Fedora, so this is no longer necessary. This was already done for the llvm package, do it for clang as well.
This commit is contained in:
parent
be819276e8
commit
573860f707
@ -1,39 +0,0 @@
|
|||||||
From 3dc5722d5c7673a879f2b4680369d3ac8b6b64b6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tom Stellard <tstellar@redhat.com>
|
|
||||||
Date: Wed, 4 Aug 2021 14:05:38 -0700
|
|
||||||
Subject: [PATCH] cmake: Allow shared libraries to customize the soname using
|
|
||||||
LLVM_ABI_REVISION
|
|
||||||
|
|
||||||
The LLVM_ABI_REVISION variable is intended to be used for release
|
|
||||||
candidates which introduce an ABI change to a shared library. This
|
|
||||||
variable can be specified per library, so there is not one global value
|
|
||||||
for all of LLVM.
|
|
||||||
|
|
||||||
For example, if we LLVM X.0.0-rc2 introduces an ABI change for a library
|
|
||||||
compared with LLVM X.0.0-rc1, then the LLVM_ABI_REVISION number for
|
|
||||||
library will be incremented by 1.
|
|
||||||
|
|
||||||
In the main branch, LLVM_ABI_REVISION should always be 0, it is only
|
|
||||||
meant to be used in the release branch.
|
|
||||||
|
|
||||||
Differential Revision: https://reviews.llvm.org/D105594
|
|
||||||
---
|
|
||||||
clang/tools/clang-shlib/CMakeLists.txt | 5 +++++
|
|
||||||
3 files changed, 19 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/clang/tools/clang-shlib/CMakeLists.txt b/clang/tools/clang-shlib/CMakeLists.txt
|
|
||||||
index 9c1f8ea452b3..4d785924e4bb 100644
|
|
||||||
--- a/clang/tools/clang-shlib/CMakeLists.txt
|
|
||||||
+++ b/clang/tools/clang-shlib/CMakeLists.txt
|
|
||||||
@@ -1,3 +1,8 @@
|
|
||||||
+# In the main branch, LLVM_ABI_REVISION should always be 0. In the release
|
|
||||||
+# branches, this should be incremented before each release candidate every
|
|
||||||
+# time the ABI of libclang-cpp.so changes.
|
|
||||||
+set(LLVM_ABI_REVISION 0)
|
|
||||||
+
|
|
||||||
# Building libclang-cpp.so fails if LLVM_ENABLE_PIC=Off
|
|
||||||
if (NOT LLVM_ENABLE_PIC)
|
|
||||||
return()
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
@ -35,10 +35,6 @@
|
|||||||
%global clang_srcdir clang-%{clang_version}%{?rc_ver:rc%{rc_ver}}.src
|
%global clang_srcdir clang-%{clang_version}%{?rc_ver:rc%{rc_ver}}.src
|
||||||
%global clang_tools_srcdir clang-tools-extra-%{clang_version}%{?rc_ver:rc%{rc_ver}}.src
|
%global clang_tools_srcdir clang-tools-extra-%{clang_version}%{?rc_ver:rc%{rc_ver}}.src
|
||||||
|
|
||||||
%if !%{maj_ver} && 0%{?rc_ver}
|
|
||||||
%global abi_revision 2
|
|
||||||
%endif
|
|
||||||
|
|
||||||
Name: %pkg_name
|
Name: %pkg_name
|
||||||
Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}}
|
Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}}
|
||||||
Release: 3%{?dist}
|
Release: 3%{?dist}
|
||||||
@ -62,7 +58,6 @@ Patch0: 0001-PATCH-clang-Reorganize-gtest-integration.patch
|
|||||||
Patch1: 0003-PATCH-Make-funwind-tables-the-default-on-all-archs.patch
|
Patch1: 0003-PATCH-Make-funwind-tables-the-default-on-all-archs.patch
|
||||||
Patch2: 0003-PATCH-clang-Don-t-install-static-libraries.patch
|
Patch2: 0003-PATCH-clang-Don-t-install-static-libraries.patch
|
||||||
Patch3: 0001-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch
|
Patch3: 0001-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch
|
||||||
Patch4: 0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch
|
|
||||||
Patch5: 0010-PATCH-clang-Produce-DWARF4-by-default.patch
|
Patch5: 0010-PATCH-clang-Produce-DWARF4-by-default.patch
|
||||||
Patch6: 0001-Take-into-account-Fedora-Specific-install-dir-for-li.patch
|
Patch6: 0001-Take-into-account-Fedora-Specific-install-dir-for-li.patch
|
||||||
|
|
||||||
@ -367,7 +362,6 @@ sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@//g' test/lit.cfg.py
|
|||||||
-DLLVM_BUILD_DOCS=ON \
|
-DLLVM_BUILD_DOCS=ON \
|
||||||
-DLLVM_ENABLE_SPHINX=ON \
|
-DLLVM_ENABLE_SPHINX=ON \
|
||||||
-DCLANG_LINK_CLANG_DYLIB=ON \
|
-DCLANG_LINK_CLANG_DYLIB=ON \
|
||||||
%{?abi_revision:-DLLVM_ABI_REVISION=%{abi_revision}} \
|
|
||||||
-DSPHINX_WARNINGS_AS_ERRORS=OFF \
|
-DSPHINX_WARNINGS_AS_ERRORS=OFF \
|
||||||
\
|
\
|
||||||
-DCLANG_BUILD_EXAMPLES:BOOL=OFF \
|
-DCLANG_BUILD_EXAMPLES:BOOL=OFF \
|
||||||
|
Loading…
Reference in New Issue
Block a user