Tom Stellard
parent
93c6a8327a
commit
e6c5567715
|
|
@ -1,59 +0,0 @@
|
|||
From d68a5a7817dc0d43853d8b84c9185dc24338664f Mon Sep 17 00:00:00 2001
|
||||
From: Tom Stellard <tstellar@redhat.com>
|
||||
Date: Wed, 6 Oct 2021 05:32:44 +0000
|
||||
Subject: [PATCH] Driver: Add a gcc equivalent triple to the list of triples to
|
||||
search
|
||||
|
||||
There are some gcc triples, like x86_64-redhat-linux, that provide the
|
||||
same behavior as a clang triple with a similar name (e.g.
|
||||
x86_64-redhat-linux-gnu). When searching for a gcc install, also search
|
||||
for a gcc equivalent triple if one exists.
|
||||
|
||||
Differential Revision: https://reviews.llvm.org/D111207
|
||||
---
|
||||
clang/lib/Driver/ToolChains/Gnu.cpp | 22 ++++++++++++++++++++++
|
||||
1 file changed, 22 insertions(+)
|
||||
|
||||
diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
|
||||
index fe5bda5c6605..fd4a7f72be14 100644
|
||||
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
|
||||
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
|
||||
@@ -1884,6 +1884,18 @@ static llvm::StringRef getGCCToolchainDir(const ArgList &Args,
|
||||
return GCC_INSTALL_PREFIX;
|
||||
}
|
||||
|
||||
+/// This function takes a 'clang' triple and converts it to an equivalent gcc
|
||||
+/// triple.
|
||||
+static const char *ConvertToGccTriple(StringRef CandidateTriple) {
|
||||
+ return llvm::StringSwitch<const char *>(CandidateTriple)
|
||||
+ .Case("aarch64-redhat-linux-gnu", "aarch64-redhat-linux")
|
||||
+ .Case("i686-redhat-linux-gnu", "i686-redhat-linux")
|
||||
+ .Case("ppc64le-redhat-linux-gnu", "ppc64le-redhat-linux")
|
||||
+ .Case("s390x-redhat-linux-gnu", "s390x-redhat-linux")
|
||||
+ .Case("x86_64-redhat-linux-gnu", "x86_64-redhat-linux")
|
||||
+ .Default(NULL);
|
||||
+}
|
||||
+
|
||||
/// Initialize a GCCInstallationDetector from the driver.
|
||||
///
|
||||
/// This performs all of the autodetection and sets up the various paths.
|
||||
@@ -1904,6 +1916,16 @@ void Generic_GCC::GCCInstallationDetector::init(
|
||||
// The compatible GCC triples for this particular architecture.
|
||||
SmallVector<StringRef, 16> CandidateTripleAliases;
|
||||
SmallVector<StringRef, 16> CandidateBiarchTripleAliases;
|
||||
+
|
||||
+ // In some cases gcc uses a slightly different triple than clang for the
|
||||
+ // same target. Convert the clang triple to the gcc equivalent and use that
|
||||
+ // to search for the gcc install.
|
||||
+ const char *ConvertedTriple = ConvertToGccTriple(TargetTriple.str());
|
||||
+ if (ConvertedTriple) {
|
||||
+ CandidateTripleAliases.push_back(ConvertedTriple);
|
||||
+ CandidateBiarchTripleAliases.push_back(ConvertedTriple);
|
||||
+ }
|
||||
+
|
||||
CollectLibDirsAndTriples(TargetTriple, BiarchVariantTriple, CandidateLibDirs,
|
||||
CandidateTripleAliases, CandidateBiarchLibDirs,
|
||||
CandidateBiarchTripleAliases);
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
@ -1,125 +0,0 @@
|
|||
From adbe188f3b1e3a0dd5ec80d9409601ba7f5b0423 Mon Sep 17 00:00:00 2001
|
||||
From: Konrad Kleine <kkleine@redhat.com>
|
||||
Date: Thu, 24 Mar 2022 09:44:21 +0100
|
||||
Subject: [PATCH] Produce DWARF4 by default
|
||||
|
||||
Have a look at the following commit to see when the move from DWARF 4 to 5 first happened upstream:
|
||||
|
||||
https://github.com/llvm/llvm-project/commit/d3b26dea16108c427b19b5480c9edc76edf8f5b4?diff=unified
|
||||
---
|
||||
clang/lib/Driver/ToolChain.cpp | 4 +---
|
||||
clang/test/CodeGen/dwarf-version.c | 4 ++--
|
||||
clang/test/Driver/as-options.s | 4 ++--
|
||||
clang/test/Driver/cl-options.c | 2 +-
|
||||
clang/test/Driver/clang-g-opts.c | 2 +-
|
||||
clang/test/Driver/ve-toolchain.c | 2 +-
|
||||
clang/test/Driver/ve-toolchain.cpp | 2 +-
|
||||
7 files changed, 9 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
|
||||
index 8dafc3d481c2..92bf26dc8ec6 100644
|
||||
--- a/clang/lib/Driver/ToolChain.cpp
|
||||
+++ b/clang/lib/Driver/ToolChain.cpp
|
||||
@@ -428,9 +428,7 @@ ToolChain::getDefaultUnwindTableLevel(const ArgList &Args) const {
|
||||
}
|
||||
|
||||
unsigned ToolChain::GetDefaultDwarfVersion() const {
|
||||
- // TODO: Remove the RISC-V special case when R_RISCV_SET_ULEB128 linker
|
||||
- // support becomes more widely available.
|
||||
- return getTriple().isRISCV() ? 4 : 5;
|
||||
+ return 4;
|
||||
}
|
||||
|
||||
Tool *ToolChain::getClang() const {
|
||||
diff --git a/clang/test/CodeGen/dwarf-version.c b/clang/test/CodeGen/dwarf-version.c
|
||||
index d307eb3f101f..e7e93bf6688c 100644
|
||||
--- a/clang/test/CodeGen/dwarf-version.c
|
||||
+++ b/clang/test/CodeGen/dwarf-version.c
|
||||
@@ -2,8 +2,8 @@
|
||||
// RUN: %clang -target x86_64-linux-gnu -gdwarf-3 -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER3
|
||||
// RUN: %clang -target x86_64-linux-gnu -gdwarf-4 -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER4
|
||||
// RUN: %clang -target x86_64-linux-gnu -gdwarf-5 -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER5
|
||||
-// RUN: %clang -target x86_64-linux-gnu -g -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER5
|
||||
-// RUN: %clang -target x86_64-linux-gnu -gdwarf -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER5
|
||||
+// RUN: %clang -target x86_64-linux-gnu -g -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER4
|
||||
+// RUN: %clang -target x86_64-linux-gnu -gdwarf -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER4
|
||||
|
||||
// The -isysroot is used as a hack to avoid LIT messing with the SDKROOT
|
||||
// environment variable which indirecty overrides the version in the target
|
||||
diff --git a/clang/test/Driver/as-options.s b/clang/test/Driver/as-options.s
|
||||
index 73d002c7ef7e..71d55f7fd537 100644
|
||||
--- a/clang/test/Driver/as-options.s
|
||||
+++ b/clang/test/Driver/as-options.s
|
||||
@@ -122,7 +122,7 @@
|
||||
// RUN: FileCheck --check-prefix=DEBUG %s
|
||||
// RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -g0 -g %s -### 2>&1 | \
|
||||
// RUN: FileCheck --check-prefix=DEBUG %s
|
||||
-// DEBUG: "-g" "-gdwarf-5"
|
||||
+// DEBUG: "-g" "-gdwarf-4"
|
||||
// RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -g -g0 %s -### 2>&1 | \
|
||||
// RUN: FileCheck --check-prefix=NODEBUG %s
|
||||
// RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -gdwarf-5 -g0 %s -### 2>&1 | \
|
||||
@@ -141,7 +141,7 @@
|
||||
// RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -gdwarf-2 %s -### 2>&1 | \
|
||||
// RUN: FileCheck --check-prefix=GDWARF2 %s
|
||||
// RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -gdwarf %s -### 2>&1 | \
|
||||
-// RUN: FileCheck --check-prefix=GDWARF5 %s
|
||||
+// RUN: FileCheck --check-prefix=GDWARF4 %s
|
||||
|
||||
// RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -gdwarf-5 %s -### 2>&1 | \
|
||||
// RUN: FileCheck --check-prefix=GDWARF5 %s
|
||||
diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c
|
||||
index 6d929b19e7e2..373905c2e0fc 100644
|
||||
--- a/clang/test/Driver/cl-options.c
|
||||
+++ b/clang/test/Driver/cl-options.c
|
||||
@@ -569,7 +569,7 @@
|
||||
// RUN: %clang_cl /Z7 -gdwarf /c -### -- %s 2>&1 | FileCheck -check-prefix=Z7_gdwarf %s
|
||||
// Z7_gdwarf: "-gcodeview"
|
||||
// Z7_gdwarf: "-debug-info-kind=constructor"
|
||||
-// Z7_gdwarf: "-dwarf-version=
|
||||
+// Z7_gdwarf: "-dwarf-version=4
|
||||
|
||||
// RUN: %clang_cl /ZH:MD5 /c -### -- %s 2>&1 | FileCheck -check-prefix=ZH_MD5 %s
|
||||
// ZH_MD5: "-gsrc-hash=md5"
|
||||
diff --git a/clang/test/Driver/clang-g-opts.c b/clang/test/Driver/clang-g-opts.c
|
||||
index 5ee0fe64fe48..985158746137 100644
|
||||
--- a/clang/test/Driver/clang-g-opts.c
|
||||
+++ b/clang/test/Driver/clang-g-opts.c
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
// CHECK-WITHOUT-G-NOT: -debug-info-kind
|
||||
// CHECK-WITH-G: "-debug-info-kind=constructor"
|
||||
-// CHECK-WITH-G: "-dwarf-version=5"
|
||||
+// CHECK-WITH-G: "-dwarf-version=4"
|
||||
// CHECK-WITH-G-DWARF2: "-dwarf-version=2"
|
||||
|
||||
// CHECK-WITH-G-STANDALONE: "-debug-info-kind=standalone"
|
||||
diff --git a/clang/test/Driver/ve-toolchain.c b/clang/test/Driver/ve-toolchain.c
|
||||
index 32e25769b6da..b8a2852daba8 100644
|
||||
--- a/clang/test/Driver/ve-toolchain.c
|
||||
+++ b/clang/test/Driver/ve-toolchain.c
|
||||
@@ -6,7 +6,7 @@
|
||||
/// Checking dwarf-version
|
||||
|
||||
// RUN: %clang -### -g --target=ve %s 2>&1 | FileCheck -check-prefix=DWARF_VER %s
|
||||
-// DWARF_VER: "-dwarf-version=5"
|
||||
+// DWARF_VER: "-dwarf-version=4"
|
||||
|
||||
///-----------------------------------------------------------------------------
|
||||
/// Checking include-path
|
||||
diff --git a/clang/test/Driver/ve-toolchain.cpp b/clang/test/Driver/ve-toolchain.cpp
|
||||
index 5a33d5eceb61..cedf895b36dc 100644
|
||||
--- a/clang/test/Driver/ve-toolchain.cpp
|
||||
+++ b/clang/test/Driver/ve-toolchain.cpp
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
// RUN: %clangxx -### -g --target=ve-unknown-linux-gnu \
|
||||
// RUN: %s 2>&1 | FileCheck -check-prefix=DWARF_VER %s
|
||||
-// DWARF_VER: "-dwarf-version=5"
|
||||
+// DWARF_VER: "-dwarf-version=4"
|
||||
|
||||
///-----------------------------------------------------------------------------
|
||||
/// Checking include-path
|
||||
--
|
||||
2.41.0
|
||||
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
From ba9cfbe8e1d034d823dabf1c76d270fce8085f1b Mon Sep 17 00:00:00 2001
|
||||
From: Tom Stellard <tstellar@redhat.com>
|
||||
Date: Thu, 9 Mar 2023 21:52:41 -0800
|
||||
Subject: [PATCH] Restore -fopenmp-implicit-rpath, disabled by default
|
||||
|
||||
Used by redhat-rpm-config on older Fedora versions.
|
||||
---
|
||||
clang/include/clang/Driver/Options.td | 6 ++++++
|
||||
clang/lib/Driver/ToolChains/CommonArgs.cpp | 19 +++++++++++++++++++
|
||||
clang/lib/Driver/ToolChains/CommonArgs.h | 3 +++
|
||||
clang/test/OpenMP/Inputs/libomp.a | 1 +
|
||||
4 files changed, 29 insertions(+)
|
||||
create mode 100644 clang/test/OpenMP/Inputs/libomp.a
|
||||
|
||||
diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
|
||||
index 31ecf98b806b..46aa49e1d0d1 100644
|
||||
--- a/clang/include/clang/Driver/Options.td
|
||||
+++ b/clang/include/clang/Driver/Options.td
|
||||
@@ -5194,6 +5194,12 @@ def offload_add_rpath: Flag<["--"], "offload-add-rpath">,
|
||||
def no_offload_add_rpath: Flag<["--"], "no-offload-add-rpath">,
|
||||
Flags<[NoArgumentUnused]>,
|
||||
Alias<frtlib_add_rpath>;
|
||||
+defm openmp_implicit_rpath: BoolFOption<"openmp-implicit-rpath",
|
||||
+ LangOpts<"OpenMP">,
|
||||
+ DefaultFalse,
|
||||
+ PosFlag<SetTrue, [], [ClangOption], "Set rpath on OpenMP executables">,
|
||||
+ NegFlag<SetFalse>,
|
||||
+ BothFlags<[NoArgumentUnused]>>;
|
||||
def r : Flag<["-"], "r">, Flags<[LinkerInput, NoArgumentUnused]>,
|
||||
Group<Link_Group>;
|
||||
def regcall4 : Flag<["-"], "regcall4">, Group<m_Group>,
|
||||
diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
|
||||
index 483ecd0ae592..55c673460a2f 100644
|
||||
--- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
|
||||
+++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
|
||||
@@ -889,6 +889,22 @@ static void addOpenMPDeviceLibC(const ToolChain &TC, const ArgList &Args,
|
||||
}
|
||||
}
|
||||
|
||||
+void tools::addOpenMPRuntimeSpecificRPath(const ToolChain &TC,
|
||||
+ const ArgList &Args,
|
||||
+ ArgStringList &CmdArgs) {
|
||||
+
|
||||
+ if (Args.hasFlag(options::OPT_fopenmp_implicit_rpath,
|
||||
+ options::OPT_fno_openmp_implicit_rpath, false)) {
|
||||
+ // Default to clang lib / lib64 folder, i.e. the same location as device
|
||||
+ // runtime
|
||||
+ SmallString<256> DefaultLibPath =
|
||||
+ llvm::sys::path::parent_path(TC.getDriver().Dir);
|
||||
+ llvm::sys::path::append(DefaultLibPath, CLANG_INSTALL_LIBDIR_BASENAME);
|
||||
+ CmdArgs.push_back("-rpath");
|
||||
+ CmdArgs.push_back(Args.MakeArgString(DefaultLibPath));
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
void tools::addOpenMPRuntimeLibraryPath(const ToolChain &TC,
|
||||
const ArgList &Args,
|
||||
ArgStringList &CmdArgs) {
|
||||
@@ -963,6 +979,9 @@ bool tools::addOpenMPRuntime(ArgStringList &CmdArgs, const ToolChain &TC,
|
||||
addOpenMPDeviceLibC(TC, Args, CmdArgs);
|
||||
|
||||
addArchSpecificRPath(TC, Args, CmdArgs);
|
||||
+
|
||||
+ if (RTKind == Driver::OMPRT_OMP)
|
||||
+ addOpenMPRuntimeSpecificRPath(TC, Args, CmdArgs);
|
||||
addOpenMPRuntimeLibraryPath(TC, Args, CmdArgs);
|
||||
|
||||
return true;
|
||||
diff --git a/clang/lib/Driver/ToolChains/CommonArgs.h b/clang/lib/Driver/ToolChains/CommonArgs.h
|
||||
index 096152bfbdcf..7e8bf6b8830c 100644
|
||||
--- a/clang/lib/Driver/ToolChains/CommonArgs.h
|
||||
+++ b/clang/lib/Driver/ToolChains/CommonArgs.h
|
||||
@@ -117,6 +117,9 @@ void AddAssemblerKPIC(const ToolChain &ToolChain,
|
||||
const llvm::opt::ArgList &Args,
|
||||
llvm::opt::ArgStringList &CmdArgs);
|
||||
|
||||
+void addOpenMPRuntimeSpecificRPath(const ToolChain &TC,
|
||||
+ const llvm::opt::ArgList &Args,
|
||||
+ llvm::opt::ArgStringList &CmdArgs);
|
||||
void addArchSpecificRPath(const ToolChain &TC, const llvm::opt::ArgList &Args,
|
||||
llvm::opt::ArgStringList &CmdArgs);
|
||||
void addOpenMPRuntimeLibraryPath(const ToolChain &TC,
|
||||
diff --git a/clang/test/OpenMP/Inputs/libomp.a b/clang/test/OpenMP/Inputs/libomp.a
|
||||
new file mode 100644
|
||||
index 000000000000..8b277f0dd5dc
|
||||
--- /dev/null
|
||||
+++ b/clang/test/OpenMP/Inputs/libomp.a
|
||||
@@ -0,0 +1 @@
|
||||
+!<arch>
|
||||
--
|
||||
2.41.0
|
||||
|
||||
|
|
@ -4,7 +4,6 @@ Date: Tue, 24 Jan 2023 22:46:25 +0000
|
|||
Subject: [PATCH] clang-tools-extra: Make test dependency on LLVMHello optional
|
||||
|
||||
This fixes clang + clang-tools-extra standalone build after
|
||||
36892727e4f19a60778e371d78f8fb09d8122c85.
|
||||
---
|
||||
clang-tools-extra/test/CMakeLists.txt | 10 +++++++++-
|
||||
clang-tools-extra/test/clang-tidy/CTTestTidyModule.cpp | 2 +-
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
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
|
||||
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
From 988dd3f3363d8ab4ee53f61e0eb5afc6646c9d4f Mon Sep 17 00:00:00 2001
|
||||
From: Nikita Popov <npopov@redhat.com>
|
||||
Date: Tue, 26 Sep 2023 13:06:29 +0200
|
||||
Subject: [PATCH] disable myst parser
|
||||
|
||||
---
|
||||
clang/docs/conf.py | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/clang/docs/conf.py b/clang/docs/conf.py
|
||||
index ca310026f53e..dfb74273b5b2 100644
|
||||
--- a/clang/docs/conf.py
|
||||
+++ b/clang/docs/conf.py
|
||||
@@ -35,9 +35,6 @@ templates_path = ["_templates"]
|
||||
|
||||
import sphinx
|
||||
|
||||
-if sphinx.version_info >= (3, 0):
|
||||
- extensions.append("myst_parser")
|
||||
-
|
||||
# The encoding of source files.
|
||||
# source_encoding = 'utf-8-sig'
|
||||
|
||||
--
|
||||
2.41.0
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
diff -Naur a/clang/docs/conf.py b/clang/docs/conf.py
|
||||
--- a/clang/docs/conf.py 2020-09-15 09:12:24.318287611 +0000
|
||||
+++ b/clang/docs/conf.py 2020-09-15 15:01:00.025893199 +0000
|
||||
@@ -37,21 +37,7 @@
|
||||
".rst": "restructuredtext",
|
||||
}
|
||||
|
||||
-try:
|
||||
- import recommonmark
|
||||
-except ImportError:
|
||||
- # manpages do not use any .md sources
|
||||
- if not tags.has("builder-man"):
|
||||
- raise
|
||||
-else:
|
||||
- import sphinx
|
||||
-
|
||||
- if sphinx.version_info >= (3, 0):
|
||||
- # This requires 0.5 or later.
|
||||
- extensions.append("recommonmark")
|
||||
- else:
|
||||
- source_parsers = {".md": "recommonmark.parser.CommonMarkParser"}
|
||||
- source_suffix[".md"] = "markdown"
|
||||
+import sphinx
|
||||
|
||||
# The encoding of source files.
|
||||
# source_encoding = 'utf-8-sig'
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# Drop the following option after debugedit adds support to DWARF-5:
|
||||
# https://sourceware.org/bugzilla/show_bug.cgi?id=28728
|
||||
-gdwarf-4 -g0
|
||||
405
clang.spec
405
clang.spec
|
|
@ -11,9 +11,23 @@
|
|||
%bcond_with compat_build
|
||||
%bcond_without check
|
||||
|
||||
%global maj_ver 17
|
||||
%global min_ver 0
|
||||
%global patch_ver 6
|
||||
%ifarch aarch64
|
||||
# Use lld on aarch64, becuase ld.bfd will occasionally fail with the error:
|
||||
# `Could not create temporary file: Too many open files`
|
||||
%bcond_without linker_lld
|
||||
%if 0%{?rhel} == 8
|
||||
# RHEL8 does not pass --build-id to the linker by default, so we need
|
||||
# to manually specify the build-id algorith that rpmbuild expects.
|
||||
# lld defaults to a different algorithm.
|
||||
%global build_ldflags %(echo %{build_ldflags} -Wl,--build-id=sha1)
|
||||
%endif
|
||||
%else
|
||||
%bcond_with linker_lld
|
||||
%endif
|
||||
|
||||
%global maj_ver 18
|
||||
%global min_ver 1
|
||||
%global patch_ver 2
|
||||
#global rc_ver 4
|
||||
|
||||
%if %{with snapshot_build}
|
||||
|
|
@ -34,13 +48,19 @@
|
|||
%global install_includedir %{install_prefix}/include
|
||||
%global install_libdir %{install_prefix}/lib
|
||||
%global install_datadir %{install_prefix}/share
|
||||
%global install_libexecdir %{install_prefix}/libexec
|
||||
%global install_docdir %{install_datadir}/doc
|
||||
|
||||
%global pkg_includedir %{install_includedir}
|
||||
%else
|
||||
%global pkg_name clang
|
||||
%global install_prefix /usr
|
||||
%global install_prefix %{_prefix}
|
||||
%global install_bindir %{_bindir}
|
||||
%global install_datadir %{_datadir}
|
||||
%global install_libdir %{_libdir}
|
||||
%global install_includedir %{_includedir}
|
||||
%global install_libexecdir %{_libexecdir}
|
||||
%global install_docdir %{_docdir}
|
||||
%endif
|
||||
|
||||
%ifarch ppc64le aarch64
|
||||
|
|
@ -48,12 +68,19 @@
|
|||
%global _smp_mflags -j8
|
||||
%endif
|
||||
|
||||
# Try to limit memory use on i686.
|
||||
%if !0%{?rhel} > 8
|
||||
%ifarch %ix86
|
||||
%constrain_build -m 3072
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%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
|
||||
|
||||
Name: %pkg_name
|
||||
Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
|
||||
Release: 1%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: A C language family front-end for LLVM
|
||||
|
||||
License: NCSA
|
||||
|
|
@ -66,39 +93,38 @@ Source1: %{llvm_snapshot_source_prefix}clang-tools-extra-%{llvm_snapshot_yyyy
|
|||
%else
|
||||
Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_srcdir}.tar.xz
|
||||
Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_srcdir}.tar.xz.sig
|
||||
%if %{without compat_build}
|
||||
Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_tools_srcdir}.tar.xz
|
||||
Source2: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_tools_srcdir}.tar.xz.sig
|
||||
%endif
|
||||
Source4: release-keys.asc
|
||||
%endif
|
||||
%if %{without compat_build}
|
||||
Source5: macros.%{name}
|
||||
%endif
|
||||
# This file is still needed because We still build on F38 in the
|
||||
# upstream-snapshot branch.
|
||||
Source6: clang.cfg
|
||||
|
||||
# Patches for clang
|
||||
Patch1: 0001-PATCH-clang-Make-funwind-tables-the-default-on-all-a.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
|
||||
# Drop the following patch after debugedit adds support to DWARF-5:
|
||||
# https://sourceware.org/bugzilla/show_bug.cgi?id=28728
|
||||
Patch4: 0001-Produce-DWARF4-by-default.patch
|
||||
# Workaround a bug in ORC on ppc64le.
|
||||
# More info is available here: https://reviews.llvm.org/D159115#4641826
|
||||
Patch5: 0001-Workaround-a-bug-in-ORC-on-ppc64le.patch
|
||||
|
||||
# RHEL specific patches
|
||||
# Avoid unwanted dependency on python-recommonmark
|
||||
Patch101: 0009-disable-recommonmark.patch
|
||||
# Avoid unwanted dependency on python-myst-parser
|
||||
Patch101: 0009-disable-myst-parser.patch
|
||||
|
||||
%if %{without compat_build}
|
||||
# Patches for clang-tools-extra
|
||||
# See https://reviews.llvm.org/D120301
|
||||
Patch201: 0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch
|
||||
%endif
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: clang
|
||||
%if %{with linker_lld}
|
||||
BuildRequires: lld
|
||||
%endif
|
||||
BuildRequires: cmake
|
||||
BuildRequires: ninja-build
|
||||
|
||||
|
|
@ -106,8 +132,8 @@ BuildRequires: ninja-build
|
|||
%global llvm_pkg_name llvm%{maj_ver}
|
||||
%else
|
||||
%global llvm_pkg_name llvm
|
||||
BuildRequires: llvm-test = %{version}
|
||||
BuildRequires: llvm-googletest = %{version}
|
||||
BuildRequires: %{llvm_pkg_name}-test = %{version}
|
||||
BuildRequires: %{llvm_pkg_name}-googletest = %{version}
|
||||
%endif
|
||||
|
||||
BuildRequires: %{llvm_pkg_name}-devel = %{version}
|
||||
|
|
@ -128,6 +154,9 @@ BuildRequires: python3-lit
|
|||
|
||||
BuildRequires: python3-sphinx
|
||||
BuildRequires: pandoc
|
||||
%if %{undefined rhel}
|
||||
BuildRequires: python3-myst-parser
|
||||
%endif
|
||||
BuildRequires: libatomic
|
||||
|
||||
# We need python3-devel for %%py3_shebang_fix
|
||||
|
|
@ -137,8 +166,10 @@ BuildRequires: python3-devel
|
|||
# For reproducible pyc file generation
|
||||
# See https://docs.fedoraproject.org/en-US/packaging-guidelines/Python_Appendix/#_byte_compilation_reproducibility
|
||||
BuildRequires: /usr/bin/marshalparser
|
||||
%if %{without compat_build}
|
||||
%global py_reproducible_pyc_path %{buildroot}%{python3_sitelib}
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# Needed for %%multilib_fix_c_header
|
||||
BuildRequires: multilib-rpm-config
|
||||
|
|
@ -203,24 +234,22 @@ Runtime library for clang.
|
|||
%package devel
|
||||
Summary: Development header files for clang
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
%if %{without compat_build}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
# The clang CMake files reference tools from clang-tools-extra.
|
||||
Requires: %{name}-tools-extra%{?_isa} = %{version}-%{release}
|
||||
%endif
|
||||
Provides: clang-devel(major) = %{maj_ver}
|
||||
|
||||
%description devel
|
||||
Development header files for clang.
|
||||
|
||||
%package resource-filesystem
|
||||
Summary: Filesystem package that owns the clang resource directory
|
||||
Provides: %{name}-resource-filesystem(major) = %{maj_ver}
|
||||
Provides: clang-resource-filesystem(major) = %{maj_ver}
|
||||
BuildArch: noarch
|
||||
|
||||
%description resource-filesystem
|
||||
This package owns the clang resouce directory: lib/clang/$version/
|
||||
|
||||
%if %{without compat_build}
|
||||
%package analyzer
|
||||
Summary: A source code analysis framework
|
||||
License: NCSA and MIT
|
||||
|
|
@ -260,7 +289,7 @@ Requires: python3
|
|||
%description -n git-clang-format
|
||||
clang-format integration for git.
|
||||
|
||||
|
||||
%if %{without compat_build}
|
||||
%package -n python3-clang
|
||||
Summary: Python3 bindings for clang
|
||||
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
|
||||
|
|
@ -269,17 +298,11 @@ Requires: python3
|
|||
%{summary}.
|
||||
|
||||
|
||||
%endif
|
||||
|
||||
|
||||
%prep
|
||||
%if %{without snapshot_build}
|
||||
%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE3}' --data='%{SOURCE0}'
|
||||
%endif
|
||||
|
||||
%if %{with compat_build}
|
||||
%autosetup -n %{clang_srcdir} -p2
|
||||
%else
|
||||
|
||||
%if %{without snapshot_build}
|
||||
%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE2}' --data='%{SOURCE1}'
|
||||
|
|
@ -322,8 +345,8 @@ find -name '*.md' | while read md; do sed -r -e 's/^( )*\* /\n\1\* /' ${md} | pa
|
|||
|
||||
%undefine __cmake_in_source_build
|
||||
|
||||
# And disable LTO on AArch64 entirely.
|
||||
%ifarch aarch64
|
||||
# Disable lto on i686 due to memory constraints.
|
||||
%ifarch %ix86
|
||||
%define _lto_cflags %{nil}
|
||||
%endif
|
||||
|
||||
|
|
@ -337,6 +360,12 @@ find -name '*.md' | while read md; do sed -r -e 's/^( )*\* /\n\1\* /' ${md} | pa
|
|||
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
|
||||
%endif
|
||||
|
||||
%if %{with linker_lld}
|
||||
# TODO: Use LLVM_USE_LLD cmake option, but this doesn't seem to work with
|
||||
# standalone builds.
|
||||
%global build_ldflags %(echo %{build_ldflags} -fuse-ld=lld)
|
||||
%endif
|
||||
|
||||
# Disable dwz on aarch64, because it takes a huge amount of time to decide not to optimize things.
|
||||
%ifarch aarch64
|
||||
%define _find_debuginfo_dwz_opts %{nil}
|
||||
|
|
@ -364,24 +393,21 @@ CFLAGS="$CFLAGS -Wno-address -Wno-nonnull -Wno-maybe-uninitialized"
|
|||
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
|
||||
%endif
|
||||
%if %{with compat_build}
|
||||
-DCLANG_BUILD_TOOLS:BOOL=OFF \
|
||||
-DCMAKE_INSTALL_PREFIX=%{install_prefix} \
|
||||
-DCLANG_INCLUDE_TESTS:BOOL=OFF \
|
||||
-DLLVM_INCLUDE_TESTS:BOOL=OFF \
|
||||
-DLLVM_CMAKE_DIR=%{install_libdir}/cmake/llvm \
|
||||
%else
|
||||
-DCLANG_INCLUDE_TESTS:BOOL=ON \
|
||||
-DLLVM_BUILD_UTILS:BOOL=ON \
|
||||
-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR=../%{clang_tools_srcdir} \
|
||||
-DLLVM_EXTERNAL_LIT=%{_bindir}/lit \
|
||||
-DLLVM_LIT_ARGS="-vv" \
|
||||
-DLLVM_MAIN_SRC_DIR=%{_datadir}/llvm/src \
|
||||
%if 0%{?__isa_bits} == 64
|
||||
-DLLVM_LIBDIR_SUFFIX=64 \
|
||||
%else
|
||||
-DLLVM_LIBDIR_SUFFIX= \
|
||||
%endif
|
||||
%endif
|
||||
-DCLANG_INCLUDE_TESTS:BOOL=ON \
|
||||
-DLLVM_BUILD_UTILS:BOOL=ON \
|
||||
-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR=../%{clang_tools_srcdir} \
|
||||
-DLLVM_EXTERNAL_LIT=%{_bindir}/lit \
|
||||
-DLLVM_LIT_ARGS="-vv" \
|
||||
-DLLVM_MAIN_SRC_DIR=%{_datadir}/llvm/src \
|
||||
\
|
||||
%if %{with snapshot_build}
|
||||
-DLLVM_VERSION_SUFFIX="%{llvm_snapshot_version_suffix}" \
|
||||
|
|
@ -410,6 +436,10 @@ CFLAGS="$CFLAGS -Wno-address -Wno-nonnull -Wno-maybe-uninitialized"
|
|||
-DCLANG_REPOSITORY_STRING="%{?fedora:Fedora}%{?rhel:Red Hat} %{version}-%{release}" \
|
||||
-DGCC_INSTALL_PREFIX=/opt/rh/gcc-toolset-13/root/usr \
|
||||
-DCLANG_RESOURCE_DIR=../lib/clang/%{maj_ver} \
|
||||
-DCLANG_CONFIG_FILE_SYSTEM_DIR=%{_sysconfdir}/%{name}/ \
|
||||
%ifarch %{arm}
|
||||
-DCLANG_DEFAULT_LINKER=lld \
|
||||
%endif
|
||||
-DCLANG_DEFAULT_UNWINDLIB=libgcc
|
||||
|
||||
%cmake_build
|
||||
|
|
@ -418,20 +448,13 @@ CFLAGS="$CFLAGS -Wno-address -Wno-nonnull -Wno-maybe-uninitialized"
|
|||
|
||||
%cmake_install
|
||||
|
||||
%if %{with compat_build}
|
||||
|
||||
# Remove binaries/other files
|
||||
rm -Rf %{buildroot}%{install_bindir}
|
||||
rm -Rf %{buildroot}%{install_prefix}/share
|
||||
rm -Rf %{buildroot}%{install_prefix}/libexec
|
||||
# Remove scanview-py helper libs
|
||||
rm -Rf %{buildroot}%{install_prefix}/lib/{libear,libscanbuild}
|
||||
|
||||
%else
|
||||
# Add a symlink in /usr/bin to clang-format-diff
|
||||
ln -s %{install_datadir}/clang/clang-format-diff.py %{buildroot}%{install_bindir}/clang-format-diff
|
||||
|
||||
# File in the macros file for other packages to use. We are not doing this
|
||||
# in the compat package, because the version macros would # conflict with
|
||||
# eachother if both clang and the clang compat package were installed together.
|
||||
%if %{without compat_build}
|
||||
install -p -m0644 -D %{SOURCE5} %{buildroot}%{_rpmmacrodir}/macros.%{name}
|
||||
sed -i -e "s|@@CLANG_MAJOR_VERSION@@|%{maj_ver}|" \
|
||||
-e "s|@@CLANG_MINOR_VERSION@@|%{min_ver}|" \
|
||||
|
|
@ -447,100 +470,133 @@ install -p -m644 bindings/python/clang/* %{buildroot}%{python3_sitelib}/clang/
|
|||
mv %{buildroot}%{_prefix}/%{_lib}/{libear,libscanbuild} %{buildroot}%{python3_sitelib}
|
||||
%py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}/{libear,libscanbuild}
|
||||
|
||||
# Fix permissions of scan-view scripts
|
||||
chmod a+x %{buildroot}%{_datadir}/scan-view/{Reporter.py,startfile.py}
|
||||
|
||||
# multilib fix
|
||||
%multilib_fix_c_header --file %{_includedir}/clang/Config/config.h
|
||||
|
||||
# Move emacs integration files to the correct directory
|
||||
mkdir -p %{buildroot}%{_emacs_sitestartdir}
|
||||
for f in clang-format.el clang-rename.el clang-include-fixer.el; do
|
||||
mv %{buildroot}{%{_datadir}/clang,%{_emacs_sitestartdir}}/$f
|
||||
done
|
||||
|
||||
# remove editor integrations (bbedit, sublime, emacs, vim)
|
||||
rm -vf %{buildroot}%{_datadir}/clang/clang-format-bbedit.applescript
|
||||
rm -vf %{buildroot}%{_datadir}/clang/clang-format-sublime.py*
|
||||
|
||||
# TODO: Package html docs
|
||||
rm -Rvf %{buildroot}%{_docdir}/Clang/clang/html
|
||||
rm -Rvf %{buildroot}%{_datadir}/clang/clang-doc-default-stylesheet.css
|
||||
rm -Rvf %{buildroot}%{_datadir}/clang/index.js
|
||||
|
||||
# TODO: What are the Fedora guidelines for packaging bash autocomplete files?
|
||||
rm -vf %{buildroot}%{_datadir}/clang/bash-autocomplete.sh
|
||||
|
||||
# Create Manpage symlinks
|
||||
ln -s clang.1.gz %{buildroot}%{_mandir}/man1/clang++.1.gz
|
||||
ln -s clang.1.gz %{buildroot}%{_mandir}/man1/clang-%{maj_ver}.1.gz
|
||||
ln -s clang.1.gz %{buildroot}%{_mandir}/man1/clang++-%{maj_ver}.1.gz
|
||||
|
||||
# Add clang++-{version} symlink
|
||||
ln -s clang++ %{buildroot}%{_bindir}/clang++-%{maj_ver}
|
||||
|
||||
|
||||
# Fix permission
|
||||
chmod u-x %{buildroot}%{_mandir}/man1/scan-build.1*
|
||||
|
||||
# Add clang++-{version} symlink
|
||||
ln -s clang++ %{buildroot}%{_bindir}/clang++-%{maj_ver}
|
||||
|
||||
%else
|
||||
# Not sure where to put these python modules for the compat build.
|
||||
rm -Rf %{buildroot}%{install_libdir}/{libear,libscanbuild}
|
||||
|
||||
# Not sure where to put the emacs integration files for the compat build.
|
||||
rm -Rf %{buildroot}%{install_datadir}/clang/*.el
|
||||
|
||||
# Not sure what to do with man pages for the compat builds
|
||||
rm -Rf %{buildroot}%{install_prefix}/share/man/
|
||||
|
||||
# Add version suffix to binaries
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
for f in %{buildroot}/%{install_bindir}/*; do
|
||||
filename=`basename $f`
|
||||
if echo $filename | grep -e '%{maj_ver}'; then
|
||||
continue
|
||||
fi
|
||||
ln -s ../../%{install_bindir}/$filename %{buildroot}/%{_bindir}/$filename-%{maj_ver}
|
||||
done
|
||||
|
||||
# Add clang++-{version} symlink
|
||||
ln -s ../../%{install_bindir}/clang++ %{buildroot}%{install_bindir}/clang++-%{maj_ver}
|
||||
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} == 38 || 0%{?rhel} <= 8
|
||||
# Install config file
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/%{name}/
|
||||
mv %{SOURCE6} %{buildroot}%{_sysconfdir}/%{name}/%{_target_platform}.cfg
|
||||
%endif
|
||||
|
||||
# Install config file for clang
|
||||
%if %{maj_ver} >=18
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/%{name}/
|
||||
echo "--gcc-triple=%{_target_cpu}-redhat-linux" >> %{buildroot}%{_sysconfdir}/%{name}/%{_target_platform}.cfg
|
||||
%endif
|
||||
|
||||
# Fix permissions of scan-view scripts
|
||||
chmod a+x %{buildroot}%{install_datadir}/scan-view/{Reporter.py,startfile.py}
|
||||
|
||||
# multilib fix
|
||||
%multilib_fix_c_header --file %{install_includedir}/clang/Config/config.h
|
||||
|
||||
# remove editor integrations (bbedit, sublime, emacs, vim)
|
||||
rm -vf %{buildroot}%{install_datadir}/clang/clang-format-bbedit.applescript
|
||||
rm -vf %{buildroot}%{install_datadir}/clang/clang-format-sublime.py*
|
||||
|
||||
# TODO: Package html docs
|
||||
rm -Rvf %{buildroot}%{install_docdir}/Clang/clang/html
|
||||
rm -Rvf %{buildroot}%{install_datadir}/clang/clang-doc-default-stylesheet.css
|
||||
rm -Rvf %{buildroot}%{install_datadir}/clang/index.js
|
||||
|
||||
# TODO: What are the Fedora guidelines for packaging bash autocomplete files?
|
||||
rm -vf %{buildroot}%{install_datadir}/clang/bash-autocomplete.sh
|
||||
|
||||
|
||||
# Create sub-directories in the clang resource directory that will be
|
||||
# populated by other packages
|
||||
mkdir -p %{buildroot}%{install_prefix}/lib/clang/%{maj_ver}/{bin,include,lib,share}/
|
||||
|
||||
|
||||
%if %{without compat_build}
|
||||
# Add a symlink in /usr/bin to clang-format-diff
|
||||
ln -s %{_datadir}/clang/clang-format-diff.py %{buildroot}%{_bindir}/clang-format-diff
|
||||
%endif
|
||||
#Add versioned resource directory macro
|
||||
mkdir -p %{buildroot}%{_rpmmacrodir}/
|
||||
echo "%%clang%{maj_ver}_resource_dir %%{_prefix}/lib/clang/%{maj_ver}" >> %{buildroot}%{_rpmmacrodir}/macros.%{name}
|
||||
|
||||
%check
|
||||
%if %{without compat_build}
|
||||
%if %{with check}
|
||||
# Build test dependencies separately, to prevent invocations of host clang from being affected
|
||||
# by LD_LIBRARY_PATH below.
|
||||
%cmake_build --target clang-test-depends \
|
||||
ExtraToolsUnitTests ClangdUnitTests ClangIncludeCleanerUnitTests ClangPseudoUnitTests
|
||||
# requires lit.py from LLVM utilities
|
||||
LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} %{_smp_mflags} check-all -C %{_vpath_builddir}
|
||||
%endif
|
||||
LD_LIBRARY_PATH=%{buildroot}/%{install_libdir} %{__ninja} %{_smp_mflags} check-all -C %{_vpath_builddir}
|
||||
%endif
|
||||
|
||||
|
||||
%if %{without compat_build}
|
||||
%files
|
||||
%license LICENSE.TXT
|
||||
%{_bindir}/clang
|
||||
%{_bindir}/clang++
|
||||
%{_bindir}/clang-%{maj_ver}
|
||||
%{_bindir}/clang++-%{maj_ver}
|
||||
%{_bindir}/clang-cl
|
||||
%{_bindir}/clang-cpp
|
||||
%{install_bindir}/clang
|
||||
%{install_bindir}/clang++
|
||||
%{install_bindir}/clang-%{maj_ver}
|
||||
%{install_bindir}/clang++-%{maj_ver}
|
||||
%{install_bindir}/clang-cl
|
||||
%{install_bindir}/clang-cpp
|
||||
%if %{without compat_build}
|
||||
%{_mandir}/man1/clang.1.gz
|
||||
%{_mandir}/man1/clang++.1.gz
|
||||
%{_mandir}/man1/clang-%{maj_ver}.1.gz
|
||||
%{_mandir}/man1/clang++-%{maj_ver}.1.gz
|
||||
%else
|
||||
%{_bindir}/clang-%{maj_ver}
|
||||
%{_bindir}/clang++-%{maj_ver}
|
||||
%{_bindir}/clang-cl-%{maj_ver}
|
||||
%{_bindir}/clang-cpp-%{maj_ver}
|
||||
%endif
|
||||
|
||||
%files libs
|
||||
%{install_prefix}/lib/clang/%{maj_ver}/include/*
|
||||
%{install_libdir}/*.so.*
|
||||
%{_sysconfdir}/%{name}/%{_target_platform}.cfg
|
||||
|
||||
%files devel
|
||||
%if %{without compat_build}
|
||||
%{_libdir}/*.so
|
||||
%{_includedir}/clang/
|
||||
%{_includedir}/clang-c/
|
||||
%{_libdir}/cmake/*
|
||||
%{_bindir}/clang-tblgen
|
||||
%dir %{_datadir}/clang/
|
||||
%else
|
||||
%{install_libdir}/*.so
|
||||
%{pkg_includedir}/clang/
|
||||
%{pkg_includedir}/clang-c/
|
||||
%{install_libdir}/cmake/
|
||||
%{install_includedir}/clang/
|
||||
%{install_includedir}/clang-c/
|
||||
%{install_libdir}/cmake/*
|
||||
%{install_bindir}/clang-tblgen
|
||||
%if %{with compat_build}
|
||||
%{_bindir}/clang-tblgen-%{maj_ver}
|
||||
%endif
|
||||
%dir %{install_datadir}/clang/
|
||||
|
||||
%files resource-filesystem
|
||||
%dir %{install_prefix}/lib/clang/
|
||||
|
|
@ -549,84 +605,133 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} %{_smp_mflags} check-all -C %
|
|||
%dir %{install_prefix}/lib/clang/%{maj_ver}/include/
|
||||
%dir %{install_prefix}/lib/clang/%{maj_ver}/lib/
|
||||
%dir %{install_prefix}/lib/clang/%{maj_ver}/share/
|
||||
%if %{without compat_build}
|
||||
%{_rpmmacrodir}/macros.%{name}
|
||||
|
||||
|
||||
%files analyzer
|
||||
%{_bindir}/scan-view
|
||||
%{_bindir}/scan-build
|
||||
%{_bindir}/analyze-build
|
||||
%{_bindir}/intercept-build
|
||||
%{_bindir}/scan-build-py
|
||||
%{_libexecdir}/ccc-analyzer
|
||||
%{_libexecdir}/c++-analyzer
|
||||
%{_libexecdir}/analyze-c++
|
||||
%{_libexecdir}/analyze-cc
|
||||
%{_libexecdir}/intercept-c++
|
||||
%{_libexecdir}/intercept-cc
|
||||
%{_datadir}/scan-view/
|
||||
%{_datadir}/scan-build/
|
||||
%{install_bindir}/scan-view
|
||||
%{install_bindir}/scan-build
|
||||
%{install_bindir}/analyze-build
|
||||
%{install_bindir}/intercept-build
|
||||
%{install_bindir}/scan-build-py
|
||||
%if %{with compat_build}
|
||||
%{_bindir}/scan-view-%{maj_ver}
|
||||
%{_bindir}/scan-build-%{maj_ver}
|
||||
%{_bindir}/analyze-build-%{maj_ver}
|
||||
%{_bindir}/intercept-build-%{maj_ver}
|
||||
%{_bindir}/scan-build-py-%{maj_ver}
|
||||
%endif
|
||||
%{install_libexecdir}/ccc-analyzer
|
||||
%{install_libexecdir}/c++-analyzer
|
||||
%{install_libexecdir}/analyze-c++
|
||||
%{install_libexecdir}/analyze-cc
|
||||
%{install_libexecdir}/intercept-c++
|
||||
%{install_libexecdir}/intercept-cc
|
||||
%{install_datadir}/scan-view/
|
||||
%{install_datadir}/scan-build/
|
||||
%if %{without compat_build}
|
||||
%{_mandir}/man1/scan-build.1.*
|
||||
%{python3_sitelib}/libear
|
||||
%{python3_sitelib}/libscanbuild
|
||||
%endif
|
||||
|
||||
|
||||
%files tools-extra
|
||||
%{_bindir}/amdgpu-arch
|
||||
%{_bindir}/clang-apply-replacements
|
||||
%{_bindir}/clang-change-namespace
|
||||
%{_bindir}/clang-check
|
||||
%{_bindir}/clang-doc
|
||||
%{_bindir}/clang-extdef-mapping
|
||||
%{_bindir}/clang-format
|
||||
%{_bindir}/clang-include-cleaner
|
||||
%{_bindir}/clang-include-fixer
|
||||
%{_bindir}/clang-move
|
||||
%{_bindir}/clang-offload-bundler
|
||||
%{_bindir}/clang-offload-packager
|
||||
%{_bindir}/clang-linker-wrapper
|
||||
%{_bindir}/clang-pseudo
|
||||
%{_bindir}/clang-query
|
||||
%{_bindir}/clang-refactor
|
||||
%{_bindir}/clang-rename
|
||||
%{_bindir}/clang-reorder-fields
|
||||
%{_bindir}/clang-repl
|
||||
%{_bindir}/clang-scan-deps
|
||||
%{_bindir}/clang-tidy
|
||||
%{_bindir}/clangd
|
||||
%{_bindir}/diagtool
|
||||
%{_bindir}/hmaptool
|
||||
%{_bindir}/nvptx-arch
|
||||
%{_bindir}/pp-trace
|
||||
%{_bindir}/c-index-test
|
||||
%{_bindir}/find-all-symbols
|
||||
%{_bindir}/modularize
|
||||
%{_bindir}/clang-format-diff
|
||||
%{install_bindir}/amdgpu-arch
|
||||
%{install_bindir}/clang-apply-replacements
|
||||
%{install_bindir}/clang-change-namespace
|
||||
%{install_bindir}/clang-check
|
||||
%{install_bindir}/clang-doc
|
||||
%{install_bindir}/clang-extdef-mapping
|
||||
%{install_bindir}/clang-format
|
||||
%{install_bindir}/clang-include-cleaner
|
||||
%{install_bindir}/clang-include-fixer
|
||||
%{install_bindir}/clang-move
|
||||
%{install_bindir}/clang-offload-bundler
|
||||
%{install_bindir}/clang-offload-packager
|
||||
%{install_bindir}/clang-linker-wrapper
|
||||
%{install_bindir}/clang-pseudo
|
||||
%{install_bindir}/clang-query
|
||||
%{install_bindir}/clang-refactor
|
||||
%{install_bindir}/clang-rename
|
||||
%{install_bindir}/clang-reorder-fields
|
||||
%{install_bindir}/clang-repl
|
||||
%{install_bindir}/clang-scan-deps
|
||||
%{install_bindir}/clang-tidy
|
||||
%{install_bindir}/clangd
|
||||
%{install_bindir}/diagtool
|
||||
%{install_bindir}/hmaptool
|
||||
%{install_bindir}/nvptx-arch
|
||||
%{install_bindir}/pp-trace
|
||||
%{install_bindir}/c-index-test
|
||||
%{install_bindir}/find-all-symbols
|
||||
%{install_bindir}/modularize
|
||||
%{install_bindir}/clang-format-diff
|
||||
%{install_bindir}/run-clang-tidy
|
||||
%if %{with compat_build}
|
||||
%{_bindir}/amdgpu-arch-%{maj_ver}
|
||||
%{_bindir}/clang-apply-replacements-%{maj_ver}
|
||||
%{_bindir}/clang-change-namespace-%{maj_ver}
|
||||
%{_bindir}/clang-check-%{maj_ver}
|
||||
%{_bindir}/clang-doc-%{maj_ver}
|
||||
%{_bindir}/clang-extdef-mapping-%{maj_ver}
|
||||
%{_bindir}/clang-format-%{maj_ver}
|
||||
%{_bindir}/clang-include-cleaner-%{maj_ver}
|
||||
%{_bindir}/clang-include-fixer-%{maj_ver}
|
||||
%{_bindir}/clang-move-%{maj_ver}
|
||||
%{_bindir}/clang-offload-bundler-%{maj_ver}
|
||||
%{_bindir}/clang-offload-packager-%{maj_ver}
|
||||
%{_bindir}/clang-linker-wrapper-%{maj_ver}
|
||||
%{_bindir}/clang-pseudo-%{maj_ver}
|
||||
%{_bindir}/clang-query-%{maj_ver}
|
||||
%{_bindir}/clang-refactor-%{maj_ver}
|
||||
%{_bindir}/clang-rename-%{maj_ver}
|
||||
%{_bindir}/clang-reorder-fields-%{maj_ver}
|
||||
%{_bindir}/clang-repl-%{maj_ver}
|
||||
%{_bindir}/clang-scan-deps-%{maj_ver}
|
||||
%{_bindir}/clang-tidy-%{maj_ver}
|
||||
%{_bindir}/clangd-%{maj_ver}
|
||||
%{_bindir}/diagtool-%{maj_ver}
|
||||
%{_bindir}/hmaptool-%{maj_ver}
|
||||
%{_bindir}/nvptx-arch-%{maj_ver}
|
||||
%{_bindir}/pp-trace-%{maj_ver}
|
||||
%{_bindir}/c-index-test-%{maj_ver}
|
||||
%{_bindir}/find-all-symbols-%{maj_ver}
|
||||
%{_bindir}/modularize-%{maj_ver}
|
||||
%{_bindir}/clang-format-diff-%{maj_ver}
|
||||
%{_bindir}/run-clang-tidy-%{maj_ver}
|
||||
%else
|
||||
%{_mandir}/man1/diagtool.1.gz
|
||||
%{_emacs_sitestartdir}/clang-format.el
|
||||
%{_emacs_sitestartdir}/clang-rename.el
|
||||
%{_emacs_sitestartdir}/clang-include-fixer.el
|
||||
%{_datadir}/clang/clang-format.py*
|
||||
%{_datadir}/clang/clang-format-diff.py*
|
||||
%{_datadir}/clang/clang-include-fixer.py*
|
||||
%{_datadir}/clang/clang-tidy-diff.py*
|
||||
%{_bindir}/run-clang-tidy
|
||||
%{_datadir}/clang/run-find-all-symbols.py*
|
||||
%{_datadir}/clang/clang-rename.py*
|
||||
%endif
|
||||
%{install_datadir}/clang/clang-format.py*
|
||||
%{install_datadir}/clang/clang-format-diff.py*
|
||||
%{install_datadir}/clang/clang-include-fixer.py*
|
||||
%{install_datadir}/clang/clang-tidy-diff.py*
|
||||
%{install_datadir}/clang/run-find-all-symbols.py*
|
||||
%{install_datadir}/clang/clang-rename.py*
|
||||
|
||||
%files tools-extra-devel
|
||||
%{_includedir}/clang-tidy/
|
||||
%{install_includedir}/clang-tidy/
|
||||
|
||||
%files -n git-clang-format
|
||||
%{_bindir}/git-clang-format
|
||||
%{install_bindir}/git-clang-format
|
||||
%if %{with compat_build}
|
||||
%{_bindir}/git-clang-format-%{maj_ver}
|
||||
%endif
|
||||
|
||||
%if %{without compat_build}
|
||||
%files -n python3-clang
|
||||
%{python3_sitelib}/clang/
|
||||
|
||||
|
||||
%endif
|
||||
%changelog
|
||||
* Thu Mar 21 2024 Tom Stellrd <tstellar@redhat.com> - 18.1.2-1
|
||||
- 18.1.2 Release
|
||||
|
||||
* Wed Nov 29 2023 Nikita Popov <npopov@redhat.com> - 17.0.6-1
|
||||
- Update to LLVM 17.0.6
|
||||
|
||||
|
|
|
|||
8
sources
8
sources
|
|
@ -1,4 +1,4 @@
|
|||
SHA512 (clang-17.0.6.src.tar.xz) = da6f670a52d60c46bbe6bfa2870106f6a6714c9566fab293b8c624a555308104a1a05cd065643091d7006ef4533a9a722dff1fccaf26f348a0c0a5c7b9331439
|
||||
SHA512 (clang-17.0.6.src.tar.xz.sig) = 091dca426d275f5a71836f2230e0f12f212527259cc4a941638104b8fcf42b4a122f9c140d07f8c663d38242d10ca5390de1f89d9d7bc0171b66c77a9aebbb3f
|
||||
SHA512 (clang-tools-extra-17.0.6.src.tar.xz) = 5110dd36ee1c966d22760000f0c28cf070fd00b05445d418d264dbd3b48426a203f934e402d408fab2602dbf39a29d66898cc7c69c1a52b5e0e6e7097f9db877
|
||||
SHA512 (clang-tools-extra-17.0.6.src.tar.xz.sig) = 17ed3072a402ffa9f723e5ae5257a68ea6f9c874bec50d91c88159d38d8c121d23974ff3983f6f0d3308b5ec07086ba5c2d4cabfe6cbefeb6613fc30b577f966
|
||||
SHA512 (clang-18.1.2.src.tar.xz) = e969eb8ad163f0bbcd3998253fc6698d3e6c75ccf5233bc5d637736d522dfd67a5cc6977ee89b21d3d3866a07849460eeb3701d89986c139b7110dc6e27ff9fd
|
||||
SHA512 (clang-18.1.2.src.tar.xz.sig) = 0f36efa13d034321b74f73bbb1de893e725936c77d04629b23e29af24bef1c76b73328e9818afd0e32bef632c74fb0b2c54dfff265f8bfce7b5c6dffbc7f3c18
|
||||
SHA512 (clang-tools-extra-18.1.2.src.tar.xz) = dbfb476c75e720ce06bea700f15227a6a21e446335843d0cd539f73692a19864c3ec1036b1378bf0446ccf7850c382d19bbb2742d7159ef2a6caa57f63611d8c
|
||||
SHA512 (clang-tools-extra-18.1.2.src.tar.xz.sig) = 4fc4f4add88b0a70c83b4eba2478616a7223c5bf399cf027ddef14f82fd41fdd26c8784b26522ca1cc0198b22451bd76d747222d80e7a7a750ec171a3c32b088
|
||||
|
|
|
|||
Loading…
Reference in New Issue