From 1eb93ac052804222302b2b0c0162247dea65ee33 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 28 2020 08:24:38 +0000 Subject: import lldb-10.0.0-2.module+el8.3.0+7004+904a04ce --- diff --git a/.gitignore b/.gitignore index 27f7ca2..fbbef16 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/lldb-9.0.0.src.tar.xz +SOURCES/hans-gpg-key.asc +SOURCES/lldb-10.0.0.src.tar.xz diff --git a/.lldb.metadata b/.lldb.metadata index 67d6232..34773ec 100644 --- a/.lldb.metadata +++ b/.lldb.metadata @@ -1 +1,2 @@ -7ac23c548c805be55713a759c4275d0389f9197e SOURCES/lldb-9.0.0.src.tar.xz +32fa4b0193960f05064f2ab31b5a89c7cf48a0b9 SOURCES/hans-gpg-key.asc +44b5a19204717a1053fab13b113172aa822b012b SOURCES/lldb-10.0.0.src.tar.xz diff --git a/SOURCES/0001-Don-t-import-readline-module.patch b/SOURCES/0001-Don-t-import-readline-module.patch deleted file mode 100644 index f21c353..0000000 --- a/SOURCES/0001-Don-t-import-readline-module.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 53fca9b6d37660280ffbd02255bf4d05c96b0055 Mon Sep 17 00:00:00 2001 -From: Tom Stellard -Date: Thu, 3 Oct 2019 20:49:43 -0700 -Subject: [PATCH] Don't import readline module - -Loading the module causes python to segfault. Disabling for now until -we can find a fix. ---- - lldb/source/Interpreter/embedded_interpreter.py | 16 +--------------- - 1 file changed, 1 insertion(+), 15 deletions(-) - -diff --git a/lldb/source/Interpreter/embedded_interpreter.py b/lldb/source/Interpreter/embedded_interpreter.py -index 8a1195d..f534bdb 100644 ---- a/lldb/source/Interpreter/embedded_interpreter.py -+++ b/lldb/source/Interpreter/embedded_interpreter.py -@@ -7,21 +7,7 @@ import code - import lldb - import traceback - --try: -- import readline -- import rlcompleter --except ImportError: -- have_readline = False --except AttributeError: -- # This exception gets hit by the rlcompleter when Linux is using -- # the readline suppression import. -- have_readline = False --else: -- have_readline = True -- if 'libedit' in readline.__doc__: -- readline.parse_and_bind('bind ^I rl_complete') -- else: -- readline.parse_and_bind('tab: complete') -+have_readline = False - - g_builtin_override_called = False - --- -1.8.3.1 - diff --git a/SOURCES/lldb-10.0.0.src.tar.xz.sig b/SOURCES/lldb-10.0.0.src.tar.xz.sig new file mode 100644 index 0000000..ff0fd5d Binary files /dev/null and b/SOURCES/lldb-10.0.0.src.tar.xz.sig differ diff --git a/SPECS/lldb.spec b/SPECS/lldb.spec index 2e4ab9b..0e99515 100644 --- a/SPECS/lldb.spec +++ b/SPECS/lldb.spec @@ -1,18 +1,22 @@ -#%%global rc_ver 3 +#%%global rc_ver 6 %global baserelease 2 +%global lldb_srcdir %{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src Name: lldb -Version: 9.0.0 +Version: 10.0.0 Release: %{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist} Summary: Next generation high-performance debugger License: NCSA URL: http://lldb.llvm.org/ -Source0: http://%{?rc_ver:pre}releases.llvm.org/%{version}/%{?rc_ver:rc%{rc_ver}}/%{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src.tar.xz - -# FIXME: Temporarily stop using readline to work-around segafult which -# happens when the readline module is loaded. -Patch0: 0001-Don-t-import-readline-module.patch +%if 0%{?rc_ver:1} +Source0: https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{lldb_srcdir}.tar.xz +Source1: https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{lldb_srcdir}.tar.xz.sig +%else +Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{lldb_srcdir}.tar.xz +Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{lldb_srcdir}.tar.xz.sig +%endif +Source2: https://prereleases.llvm.org/%{version}/hans-gpg-key.asc BuildRequires: cmake BuildRequires: llvm-devel = %{version} @@ -53,7 +57,7 @@ Requires: python3-six The package contains the LLDB Python module. %prep -%autosetup -n %{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src -p2 +%autosetup -n %{lldb_srcdir} -p2 %build @@ -84,6 +88,7 @@ CXXFLAGS="%{optflags} -Wno-error=format-security" -DPYTHON_VERSION_MAJOR:STRING=$(%{__python3} -c "import sys; print(sys.version_info.major)") \ -DPYTHON_VERSION_MINOR:STRING=$(%{__python3} -c "import sys; print(sys.version_info.minor)") \ -DLLVM_EXTERNAL_LIT=%{_bindir}/lit \ + -DCLANG_LINK_CLANG_DYLIB=ON \ -DLLVM_LIT_ARGS="-sv \ --path %{_libdir}/llvm" \ @@ -121,6 +126,15 @@ rm -f %{buildroot}%{python3_sitearch}/six.* %{python3_sitearch}/lldb %changelog +* Mon Jun 15 2020 sguelton@redhat.com - 10.0.0-2 +- Fix multilib integration, see rhbz#1841073 + +* Thu Apr 9 2020 sguelton@redhat.com - 10.0.0-1 +- 10.0.0 final + +* Sat Dec 21 2019 Tom Stellard - 9.0.1-1 +- 9.0.1 Release + * Fri Oct 04 2019 Tom Stellard - 9.0.0-2 - Disable readline module to work-around segafult