From aec99db3ed7e2eecff1366c4b8b9a8682fd82712 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 27 Sep 2022 12:57:56 +0200 Subject: [PATCH] Export GetHostTriple.cmake --- 0001-Export-GetHostTriple.cmake.patch | 25 +++++++++++++++++++++++++ llvm.spec | 8 +++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0001-Export-GetHostTriple.cmake.patch diff --git a/0001-Export-GetHostTriple.cmake.patch b/0001-Export-GetHostTriple.cmake.patch new file mode 100644 index 0000000..fe5a37f --- /dev/null +++ b/0001-Export-GetHostTriple.cmake.patch @@ -0,0 +1,25 @@ +From 1d22ceca60fe0614f34252c4def041b05ca5d925 Mon Sep 17 00:00:00 2001 +From: Nikita Popov +Date: Tue, 27 Sep 2022 12:55:35 +0200 +Subject: [PATCH] Export GetHostTriple.cmake + +This is needed by the runtimes build. +--- + llvm/cmake/modules/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt +index 428d8bff1cc6..0dd39b0db9a3 100644 +--- a/llvm/cmake/modules/CMakeLists.txt ++++ b/llvm/cmake/modules/CMakeLists.txt +@@ -176,7 +176,6 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + PATTERN LLVMConfigExtensions.cmake EXCLUDE + PATTERN LLVMConfigVersion.cmake EXCLUDE + PATTERN LLVM-Config.cmake EXCLUDE +- PATTERN GetHostTriple.cmake EXCLUDE + PATTERN llvm-driver-template.cpp.in) + + if (NOT LLVM_ENABLE_IDE) +-- +2.37.3 + diff --git a/llvm.spec b/llvm.spec index 3dd770d..6a9477d 100644 --- a/llvm.spec +++ b/llvm.spec @@ -72,7 +72,7 @@ Name: %{pkg_name} Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Low Level Virtual Machine License: NCSA @@ -98,6 +98,9 @@ Patch2: 0003-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch # TODO: Can be dropped for LLVM 16, see https://reviews.llvm.org/D131282. Patch3: 0001-Install-clang-tblgen.patch +# Export GetHostTriple.cmake for use by the runtimes build. +Patch4: 0001-Export-GetHostTriple.cmake.patch + BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: clang @@ -565,6 +568,9 @@ fi %endif %changelog +* Tue Sep 27 2022 Nikita Popov - 15.0.0-2 +- Export GetHostTriple.cmake + * Tue Sep 06 2022 Nikita Popov - 15.0.0-1 - Update to LLVM 15.0.0