diff --git a/0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch b/0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch index bebc5485e6e7128c412f63398884d50ac8a8f2b7..af98c1cd5c9b40120de0358433f03bddd2af558d 100644 --- a/0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch +++ b/0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch @@ -14,7 +14,7 @@ index 20d584c48bad..7bad2a9928cd 100644 --- a/lldb/CMakeLists.txt +++ b/lldb/CMakeLists.txt @@ -1,9 +1,9 @@ - cmake_minimum_required(VERSION 3.13.4) + cmake_minimum_required(VERSION 3.20.0) if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) - set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) diff --git a/0002-fix-error-clang-dir.patch b/0002-fix-error-clang-dir.patch new file mode 100644 index 0000000000000000000000000000000000000000..5522960e3b83f57e686568c8cc9f57404c1b64ff --- /dev/null +++ b/0002-fix-error-clang-dir.patch @@ -0,0 +1,21 @@ +diff --git "a/lldb/cmake/modules/LLDBStandalone.cmake" "b/lldb/cmake/modules/LLDBStandalone.cmake" +index fd16716..e9bcabc 100644 +--- "a/lldb/cmake/modules/LLDBStandalone.cmake" ++++ "b/lldb/cmake/modules/LLDBStandalone.cmake" +@@ -128,16 +128,3 @@ endif() + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}) +- +-# If LLDB is building against a prebuilt Clang, then the Clang resource +-# directory that LLDB is using for its embedded Clang instance needs to point to +-# the resource directory of the used Clang installation. +-if (NOT TARGET clang-resource-headers) +- include(GetClangResourceDir) +- get_clang_resource_dir(LLDB_EXTERNAL_CLANG_RESOURCE_DIR +- PREFIX "${Clang_DIR}/../../../") +- +- if (NOT EXISTS ${LLDB_EXTERNAL_CLANG_RESOURCE_DIR}) +- message(FATAL_ERROR "Expected directory for clang-resource-headers not found: ${LLDB_EXTERNAL_CLANG_RESOURCE_DIR}") +- endif() +-endif() diff --git a/lldb-16.0.6.src.tar.xz b/lldb-17.0.6.src.tar.xz similarity index 56% rename from lldb-16.0.6.src.tar.xz rename to lldb-17.0.6.src.tar.xz index f162c8a234fcb60f591c0f83a95629ff96f44473..c8a129a6fbd07cff3c125fb0b41630520b81881d 100644 Binary files a/lldb-16.0.6.src.tar.xz and b/lldb-17.0.6.src.tar.xz differ diff --git a/lldb.spec b/lldb.spec index 9f8168d3bab3b54b6fc06128afe4e4dd4b251df3..e3803a76973703b6724deac44055b2489374dc02 100644 --- a/lldb.spec +++ b/lldb.spec @@ -1,10 +1,10 @@ -%define anolis_release 2 +%define anolis_release 1 %global toolchain clang %undefine _include_frame_pointers Name: lldb -Version: 16.0.6 +Version: 17.0.6 Release: %{anolis_release}%{?dist} Summary: Next generation high-performance debugger @@ -13,6 +13,7 @@ URL: http://lldb.llvm.org/ Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{name}-%{version}.src.tar.xz Patch0: 0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch +Patch1: 0002-fix-error-clang-dir.patch BuildRequires: ninja-build clang cmake BuildRequires: llvm-static = %{version} llvm-devel = %{version} llvm-test = %{version} @@ -78,6 +79,7 @@ The %{name}-doc package contains documentation files for %{name}. -DPYTHON_VERSION_MINOR:STRING=$(%{__python3} -c "import sys; print(sys.version_info.minor)") \ -DLLVM_EXTERNAL_LIT=%{_bindir}/lit \ -DCLANG_LINK_CLANG_DYLIB=ON \ + -DCLANG_RESOURCE_DIR=$(realpath --relative-to=/usr/bin %{clang_resource_dir}) \ -DLLVM_LIT_ARGS="-sv \ --path %{_libdir}/llvm" \ @@ -119,6 +121,9 @@ rm -f %{buildroot}%{python3_sitearch}/six.* %doc CODE_OWNERS.txt %changelog +* Wed Mar 27 2024 Xiaoping Liu - 17.0.6-1 +- update to 17.0.6 + * Tue Mar 12 2024 Bo Ren - 16.0.6-2 - Rebuild with python3.11