From b4d4fe0913cf9fabe5e687c827e41c498d41b93e Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 18 Apr 2023 15:44:29 +0200 Subject: [PATCH] Update to LLVM 16.0.1 Resolves: #2178739 --- .gitignore | 99 +------------------ ...Change-LLVM_COMMON_CMAKE_UTILS-usage.patch | 30 ++++++ lldb.spec | 12 ++- sources | 5 +- 4 files changed, 42 insertions(+), 104 deletions(-) create mode 100644 0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch diff --git a/.gitignore b/.gitignore index 8883192..b67dddf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,96 +1,3 @@ -/lldb-3.7.1.src.tar.xz -/lldb-3.8.0rc2.src.tar.xz -/lldb-3.8.0rc3.src.tar.xz -/lldb-3.8.0.src.tar.xz -/lldb-3.9.0.src.tar.xz -/lldb-3.9.1.src.tar.xz -/lldb-4.0.0.src.tar.xz -/lldb-4.0.1.src.tar.xz -/lldb-5.0.0.src.tar.xz -/lldb-5.0.1.src.tar.xz -/lldb-6.0.0rc1.src.tar.xz -/lldb-6.0.0rc2.src.tar.xz -/lldb-6.0.0.src.tar.xz -/lldb-6.0.1rc1.src.tar.xz -/lldb-6.0.1.src.tar.xz -/lldb-7.0.0rc1.src.tar.xz -/lldb-7.0.0rc2.src.tar.xz -/lldb-7.0.0rc3.src.tar.xz -/lldb-7.0.0.src.tar.xz -/lldb-7.0.1.src.tar.xz -/lldb-8.0.0rc1.src.tar.xz -/lldb-8.0.0rc2.src.tar.xz -/lldb-8.0.0rc4.src.tar.xz -/lldb-8.0.0.src.tar.xz -/lldb-9.0.0rc3.src.tar.xz -/lldb-9.0.0.src.tar.xz -/lldb-9.0.1.src.tar.xz -/lldb-10.0.0rc1.src.tar.xz -/lldb-10.0.0rc1.src.tar.xz.sig -/lldb-10.0.0rc2.src.tar.xz -/lldb-10.0.0rc2.src.tar.xz.sig -/lldb-10.0.0rc3.src.tar.xz -/lldb-10.0.0rc3.src.tar.xz.sig -/lldb-10.0.0rc4.src.tar.xz -/lldb-10.0.0rc4.src.tar.xz.sig -/lldb-10.0.0rc5.src.tar.xz -/lldb-10.0.0rc5.src.tar.xz.sig -/lldb-10.0.0rc6.src.tar.xz -/lldb-10.0.0rc6.src.tar.xz.sig -/lldb-10.0.0.src.tar.xz -/lldb-10.0.0.src.tar.xz.sig -/lldb-11.0.0rc1.src.tar.xz.sig -/lldb-11.0.0rc1.src.tar.xz -/lldb-11.0.0rc2.src.tar.xz -/lldb-11.0.0rc2.src.tar.xz.sig -/lldb-11.0.0rc3.src.tar.xz -/lldb-11.0.0rc3.src.tar.xz.sig -/lldb-11.0.0rc5.src.tar.xz -/lldb-11.0.0rc5.src.tar.xz.sig -/lldb-11.0.0rc6.src.tar.xz -/lldb-11.0.0rc6.src.tar.xz.sig -/lldb-11.0.0.src.tar.xz -/lldb-11.0.0.src.tar.xz.sig -/lldb-11.0.1rc1.src.tar.xz -/lldb-11.0.1rc1.src.tar.xz.sig -/lldb-11.0.1rc2.src.tar.xz -/lldb-11.0.1rc2.src.tar.xz.sig -/lldb-11.0.1.src.tar.xz -/lldb-11.0.1.src.tar.xz.sig -/lldb-11.1.0rc1.src.tar.xz -/lldb-11.1.0rc1.src.tar.xz.sig -/lldb-11.1.0rc2.src.tar.xz -/lldb-11.1.0rc2.src.tar.xz.sig -/lldb-12.0.0rc1.src.tar.xz -/lldb-12.0.0rc1.src.tar.xz.sig -/lldb-12.0.0rc2.src.tar.xz -/lldb-12.0.0rc2.src.tar.xz.sig -/lldb-12.0.0rc3.src.tar.xz -/lldb-12.0.0rc3.src.tar.xz.sig -/lldb-12.0.0rc4.src.tar.xz -/lldb-12.0.0rc4.src.tar.xz.sig -/lldb-12.0.0rc5.src.tar.xz -/lldb-12.0.0rc5.src.tar.xz.sig -/lldb-12.0.0.src.tar.xz -/lldb-12.0.0.src.tar.xz.sig -/lldb-12.0.1.src.tar.xz -/lldb-12.0.1.src.tar.xz.sig -/lldb-13.0.0.src.tar.xz -/lldb-13.0.0.src.tar.xz.sig -/lldb-13.0.1.src.tar.xz -/lldb-13.0.1.src.tar.xz.sig -/lldb-14.0.0.src.tar.xz.sig -/lldb-14.0.0.src.tar.xz -/lldb-14.0.5.src.tar.xz -/lldb-14.0.5.src.tar.xz.sig -/lldb-14.0.6.src.tar.xz.sig -/lldb-14.0.6.src.tar.xz -/lldb-15.0.1.src.tar.xz -/lldb-15.0.1.src.tar.xz.sig -/f0a25fe0b746f56295d5c02116ba28d2f965c175.diff -/81fc5f7909a4ef5a8d4b5da2a10f77f7cb01ba63.diff -/lldb-15.0.6.src.tar.xz -/lldb-15.0.6.src.tar.xz.sig -/6f59f302e4358b4dc869bc298c2b9c06aa716b60.diff -/lldb-15.0.7.src.tar.xz -/lldb-15.0.7.src.tar.xz.sig +/*.tar.xz +/*.tar.xz.sig +/*.src.rpm diff --git a/0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch b/0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch new file mode 100644 index 0000000..bebc548 --- /dev/null +++ b/0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch @@ -0,0 +1,30 @@ +From fb389f0cd6b4e8996157fa7d7bc347fde7b43656 Mon Sep 17 00:00:00 2001 +From: Tulio Magno Quites Machado Filho +Date: Thu, 23 Mar 2023 16:06:10 -0300 +Subject: [PATCH] [lldb] Change LLVM_COMMON_CMAKE_UTILS usage + +Let LLVM_COMMON_CMAKE_UTILS store the directory where cmake modules are +available and stop assuming its directory structure. +--- + lldb/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt +index 20d584c48bad..7bad2a9928cd 100644 +--- a/lldb/CMakeLists.txt ++++ b/lldb/CMakeLists.txt +@@ -1,9 +1,9 @@ + cmake_minimum_required(VERSION 3.13.4) + + if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) +- set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) ++ set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules) + endif() +-include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake ++include(${LLVM_COMMON_CMAKE_UTILS}/CMakePolicy.cmake + NO_POLICY_SCOPE) + + # Add path for custom modules. +-- +2.39.2 + diff --git a/lldb.spec b/lldb.spec index 8cf449b..221680f 100644 --- a/lldb.spec +++ b/lldb.spec @@ -1,5 +1,5 @@ %global toolchain clang -%global lldb_version 15.0.7 +%global lldb_version 16.0.1 %global lldb_srcdir %{name}-%{lldb_version}.src # LTO disabled for now to fix the build @@ -10,15 +10,13 @@ Version: %{lldb_version} Release: 1%{?dist} Summary: Next generation high-performance debugger -License: NCSA +License: Apache-2.0 WITH LLVM-exception OR NCSA URL: http://lldb.llvm.org/ Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{lldb_version}/%{lldb_srcdir}.tar.xz Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{lldb_version}/%{lldb_srcdir}.tar.xz.sig Source2: release-keys.asc -# TODO: Drop once 16.0.0 is out -Patch0: https://github.com/llvm/llvm-project/commit/6f59f302e4358b4dc869bc298c2b9c06aa716b60.diff - +Patch0: 0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch # RHEL only: We build LLVM with clang, which now defaults to using the # libstdc++ from gcc-toolset-12. Since we're linking some clang @@ -83,6 +81,7 @@ The package contains the LLDB Python module. -DCMAKE_SKIP_RPATH:BOOL=ON \ -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \ -DLLVM_CONFIG:FILEPATH=/usr/bin/llvm-config-%{__isa_bits} \ + -DLLVM_COMMON_CMAKE_UTILS=%{_libdir}/cmake/llvm \ \ -DLLDB_DISABLE_CURSES:BOOL=OFF \ -DLLDB_DISABLE_LIBEDIT:BOOL=OFF \ @@ -138,6 +137,9 @@ rm -f %{buildroot}%{python3_sitearch}/six.* %{python3_sitearch}/lldb %changelog +* Tue Apr 18 2023 Nikita Popov - 16.0.1-1 +- Update to LLVM 16.0.1 + * Tue Jan 17 2023 Konrad Kleine - 15.0.7-1 - Update to 15.0.7 diff --git a/sources b/sources index 96496f4..573cbf0 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (lldb-15.0.7.src.tar.xz) = 27f94fd87827d08959a572038c22fd558e1776f94e1678e900d6e28517ae6fe2d89cbc719d9c65cd2879fc6bd97d291f90c4b8e6fe283f02fdf210ed138c80fa -SHA512 (lldb-15.0.7.src.tar.xz.sig) = 92b8e6368d7fa226d6cf7fc8a2bcda6d4915eb418de2e1d07cb0b357b6c567998c78c57579234b8ff26151edb0408d192ddedccdfa8d493c385be466aa3b23ca -SHA512 (6f59f302e4358b4dc869bc298c2b9c06aa716b60.diff) = 07d1965d66f042b292a4c60bf0451a02b8b581a6318097a0cca19b32a3c1e1e586f781b5fd7a86214d16cb38b78037a17fec7e6348ea0d8887ead491776fb735 +SHA512 (lldb-16.0.1.src.tar.xz) = 1691f8b25e76fa070a3ff4a6b13675e6af9926a5b9039052969a7881f1f478777f92c214df69847d958ae67275b4ff05568420cbc39a2ed5bf8c24b436bac568 +SHA512 (lldb-16.0.1.src.tar.xz.sig) = 188266bab767e9ae06dbea00f8c6068f7042a1f89cf54e800fc1c5d6db7dbeccd13f3a9580ba5240088f565b0fdd9dc89fa14f83061171f17b1c295e0c6ca45d