From 938c744f3aafe0105294f190d518371f9db093a4 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 15 Nov 2023 04:21:31 +0000 Subject: [PATCH] import UBI lldb-16.0.6-1.module+el8.9.0+19220+2631d101 --- .gitignore | 4 +- .lldb.metadata | 4 +- ...Change-LLVM_COMMON_CMAKE_UTILS-usage.patch | 30 +++++ ...db-Disable-std-vector-pretty-printer.patch | 28 +++++ .../disable-std-vector-prettyprinter.patch | 15 --- SOURCES/lldb-15.0.7.src.tar.xz.sig | Bin 566 -> 0 bytes SOURCES/release-keys.asc | 104 ++++++++++++++++++ SPECS/lldb.spec | 16 ++- 8 files changed, 179 insertions(+), 22 deletions(-) create mode 100644 SOURCES/0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch create mode 100644 SOURCES/0001-lldb-Disable-std-vector-pretty-printer.patch delete mode 100644 SOURCES/disable-std-vector-prettyprinter.patch delete mode 100644 SOURCES/lldb-15.0.7.src.tar.xz.sig create mode 100644 SOURCES/release-keys.asc diff --git a/.gitignore b/.gitignore index 07c3c26..b6fa5b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/lldb-15.0.7.src.tar.xz -SOURCES/release-keys.asc +SOURCES/lldb-16.0.6.src.tar.xz +SOURCES/lldb-16.0.6.src.tar.xz.sig diff --git a/.lldb.metadata b/.lldb.metadata index ed37904..8246395 100644 --- a/.lldb.metadata +++ b/.lldb.metadata @@ -1,2 +1,2 @@ -2966a93fab2ed784f0afbad548ba20ec39c77c28 SOURCES/lldb-15.0.7.src.tar.xz -347bdd5ee6d6b93c9644c268511815912c0fb2dc SOURCES/release-keys.asc +42e67369cd63a992369a638f289cc3a787d09c8f SOURCES/lldb-16.0.6.src.tar.xz +bc87caa10c21c9e53a6afe4d191a299b4905495e SOURCES/lldb-16.0.6.src.tar.xz.sig diff --git a/SOURCES/0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch b/SOURCES/0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch new file mode 100644 index 0000000..bebc548 --- /dev/null +++ b/SOURCES/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/SOURCES/0001-lldb-Disable-std-vector-pretty-printer.patch b/SOURCES/0001-lldb-Disable-std-vector-pretty-printer.patch new file mode 100644 index 0000000..e5ad0ae --- /dev/null +++ b/SOURCES/0001-lldb-Disable-std-vector-pretty-printer.patch @@ -0,0 +1,28 @@ +From c0e0fdd99c372096a4e018d57443f2d842bb510a Mon Sep 17 00:00:00 2001 +From: Tom Stellard +Date: Fri, 28 Apr 2023 15:42:55 -0700 +Subject: [PATCH] lldb: Disable std vector pretty printer + +--- + lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp +index 1b152c16eac2..a2b7aa4672bf 100644 +--- a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp ++++ b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp +@@ -1089,11 +1089,6 @@ static void LoadLibStdcppFormatters(lldb::TypeCategoryImplSP cpp_category_sp) { + SyntheticChildren::Flags stl_deref_flags = stl_synth_flags; + stl_deref_flags.SetFrontEndWantsDereference(); + +- cpp_category_sp->AddTypeSynthetic( +- "^std::vector<.+>(( )?&)?$", eFormatterMatchRegex, +- SyntheticChildrenSP(new ScriptedSyntheticChildren( +- stl_synth_flags, +- "lldb.formatters.cpp.gnu_libstdcpp.StdVectorSynthProvider"))); + cpp_category_sp->AddTypeSynthetic( + "^std::map<.+> >(( )?&)?$", eFormatterMatchRegex, + SyntheticChildrenSP(new ScriptedSyntheticChildren( +-- +2.31.1 + diff --git a/SOURCES/disable-std-vector-prettyprinter.patch b/SOURCES/disable-std-vector-prettyprinter.patch deleted file mode 100644 index 1f1150b..0000000 --- a/SOURCES/disable-std-vector-prettyprinter.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ruN lldb-14.0.0.src.orig/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp lldb-14.0.0.src/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp ---- a/lldb-14.0.0.src.orig/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp 2022-03-14 10:44:55.000000000 +0100 -+++ b/lldb-14.0.0.src/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp 2022-06-08 07:06:32.227607437 +0200 -@@ -940,11 +940,6 @@ - stl_deref_flags.SetFrontEndWantsDereference(); - - cpp_category_sp->GetRegexTypeSyntheticsContainer()->Add( -- RegularExpression("^std::vector<.+>(( )?&)?$"), -- SyntheticChildrenSP(new ScriptedSyntheticChildren( -- stl_synth_flags, -- "lldb.formatters.cpp.gnu_libstdcpp.StdVectorSynthProvider"))); -- cpp_category_sp->GetRegexTypeSyntheticsContainer()->Add( - RegularExpression("^std::map<.+> >(( )?&)?$"), - SyntheticChildrenSP(new ScriptedSyntheticChildren( - stl_synth_flags, diff --git a/SOURCES/lldb-15.0.7.src.tar.xz.sig b/SOURCES/lldb-15.0.7.src.tar.xz.sig deleted file mode 100644 index 00d3ebd59e6652dbf6828162d9f34a4c899a2a4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j*jP9iaCzek0rjBbvi$CRmtL7j>P0%O0rK>!K~5TeJF zsfIzFilz4t|4-n7G1UPfob{31?i!2_zDKG8Ku{L+ohmR)=GAY*h`4lNc=of#m5x1; zP$F$O^c1f#m2@bXK$0omoHK>Sp>){<_>nT=(~vjxpRT8W7i6**Q8OpXD8+oEtk8mO zpLXMrmwt!e`8{_HhfW}dZ;8siU)#k0-wV$@{OXZgw_~(59N!LaKCpvMw{ZH94t<=I zAMYm?1kw>59jhDU#9!Bh5IRNsg36@Y<9<8U>UK^8?>#NwPQI^JPyMba8}|<_C?%-# zmvT^trD#IRK=yJa%^x7LVBgli3$!Leg*s$TVmY9&?vm4_SN=$q8lm^pcsfgRqRO^&9)p4gX+&w5Ng>F}3 z2O1f~Oy=?sZqf&M4F>iJpO3RC?f=iZ6pwl>=ux1~O26DJn!H!<*hbj$>k3~O-Fb!} zBN&DX?pXIoM~qCBNw|3nv - 16.0.6-1 +- 16.0.6 Release + +* Fri Apr 28 2023 Tom Stellard - 16.0.0-1 +- 16.0.0 Release + * Thu Jan 19 2023 Tom Stellard - 15.0.7-1 - Update to LLVM 15.0.7