From 4dd7e4708c9a49874e862ddcfbc95181e1fc8f5e Mon Sep 17 00:00:00 2001 From: Renbo Date: Tue, 31 Jan 2023 14:27:41 +0800 Subject: [PATCH 1/2] update to lldb-14.0.6-1.module+el8.7.0+15816+ec020e8f Signed-off-by: Renbo --- disable-std-vector-prettyprinter.patch | 15 +++++++++++++ download | 4 ++-- lldb.spec | 30 ++++++++++++++++++++------ 3 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 disable-std-vector-prettyprinter.patch diff --git a/disable-std-vector-prettyprinter.patch b/disable-std-vector-prettyprinter.patch new file mode 100644 index 0000000..1f1150b --- /dev/null +++ b/disable-std-vector-prettyprinter.patch @@ -0,0 +1,15 @@ +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/download b/download index 817dcee..6a7d069 100644 --- a/download +++ b/download @@ -1,2 +1,2 @@ -6af3b882e301e523e1a33af674e90d30 lldb-13.0.1.src.tar.xz -1a5d4dd8a8dfbbfe62e85447fa184489 lldb-13.0.1.src.tar.xz.sig +4ffc428ec564dc6a8399b60cf7d2e0e5 lldb-14.0.6.src.tar.xz +d92730a415f6e9e8a2063c0fe7a7d930 lldb-14.0.6.src.tar.xz.sig diff --git a/lldb.spec b/lldb.spec index f2a751b..f3eb37e 100644 --- a/lldb.spec +++ b/lldb.spec @@ -1,13 +1,11 @@ -%define anolis_release .0.1 -#global rc_ver 3 -%global lldb_version 13.0.1 +%global lldb_version 14.0.6 +#global rc_ver 2 %global lldb_srcdir %{name}-%{lldb_version}%{?rc_ver:rc%{rc_ver}}.src Name: lldb Version: %{lldb_version}%{?rc_ver:~rc%{rc_ver}} -Release: 1%{anolis_release}%{?dist} +Release: 1%{?dist} Summary: Next generation high-performance debugger -ExcludeArch: loongarch64 License: NCSA URL: http://lldb.llvm.org/ @@ -34,6 +32,17 @@ BuildRequires: multilib-rpm-config Requires: python3-lldb +# There is a problem with the debug info generated by the +# GCC version we ship in RHEL 8. It somehow makes it very +# hard for lldb to inspect std::vector types. +# Disable the pretty-printer for now, since otherwise +# such vectors look empty to the developer even though +# they aren't. +# See https://bugzilla.redhat.com/show_bug.cgi?id=2082508 +Patch001: disable-std-vector-prettyprinter.patch + +# For origin certification +BuildRequires: gnupg2 %description LLDB is a next generation, high-performance debugger. It is built as a set @@ -60,6 +69,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The package contains the LLDB Python module. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -n %{lldb_srcdir} -p2 %build @@ -131,8 +141,14 @@ rm -f %{buildroot}%{python3_sitearch}/six.* %{python3_sitearch}/lldb %changelog -* Fri Nov 11 2022 Liwei Ge - 13.0.1-1.0.1 -- Disable loongarch build +* Tue Jun 28 2022 Tom Stellard - 14.0.6-1 +- 14.0.6 Release + +* Wed Jun 08 2022 Timm Bäder - 14.0.0-2 +- Disable libstdc++ std::vector prettyprinter + +* Thu Apr 07 2022 Timm Bäder - 14.0.0-1 +- Update to 14.0.0 * Thu Feb 03 2022 Tom Stellard - 13.0.1-1 - 13.0.1 Release -- Gitee From 5a3836bcbe2e1f18419adea497e45924a1c6ae4a Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Fri, 11 Nov 2022 11:03:02 +0800 Subject: [PATCH 2/2] spec: disable loongarch build --- lldb.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lldb.spec b/lldb.spec index f3eb37e..fd877ef 100644 --- a/lldb.spec +++ b/lldb.spec @@ -1,11 +1,13 @@ +%define anolis_release .0.1 %global lldb_version 14.0.6 #global rc_ver 2 %global lldb_srcdir %{name}-%{lldb_version}%{?rc_ver:rc%{rc_ver}}.src Name: lldb Version: %{lldb_version}%{?rc_ver:~rc%{rc_ver}} -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} Summary: Next generation high-performance debugger +ExcludeArch: loongarch64 License: NCSA URL: http://lldb.llvm.org/ @@ -141,6 +143,9 @@ rm -f %{buildroot}%{python3_sitearch}/six.* %{python3_sitearch}/lldb %changelog +* Tue Jan 31 2023 Liwei Ge - 14.0.6-1.0.1 +- Disable loongarch build + * Tue Jun 28 2022 Tom Stellard - 14.0.6-1 - 14.0.6 Release -- Gitee