import lldb-8.0.1-1.module+el8.1.0+3866+6be7f4d8

.gitignore

@@ -1 +1 @@
-SOURCES/lldb-7.0.1.src.tar.xz
+SOURCES/lldb-8.0.1.src.tar.xz

.lldb.metadata

@@ -1 +1 @@
-6286b90b2762404baee55a69a2a7e9ed0fce58a2 SOURCES/lldb-7.0.1.src.tar.xz
+3333ac8f4208d12b863a016a89e1aa40b75ab918 SOURCES/lldb-8.0.1.src.tar.xz

SOURCES/0001-Convert-symbolication.py-to-python3-using-2to3.patch

@@ -1,165 +0,0 @@
-From 660490d17fa1c649a7ad86da4a197c91090ce97a Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Wed, 3 Oct 2018 15:44:30 -0700
-Subject: [PATCH] Convert symbolication.py to python3 using 2to3
-
----
- examples/python/symbolication.py | 70 ++++++++++++++++++++--------------------
- 1 file changed, 35 insertions(+), 35 deletions(-)
-
-diff --git a/examples/python/symbolication.py b/examples/python/symbolication.py
-index b655ad0..313d724 100755
---- a/examples/python/symbolication.py
-+++ b/examples/python/symbolication.py
-@@ -27,7 +27,7 @@
- #----------------------------------------------------------------------
- 
- import lldb
--import commands
-+import subprocess
- import optparse
- import os
- import plistlib
-@@ -203,13 +203,13 @@ class Section:
-                 if op == '+':
-                     self.end_addr += self.start_addr
-                 return True
--        print 'error: invalid section info string "%s"' % s
--        print 'Valid section info formats are:'
--        print 'Format                Example                    Description'
--        print '--------------------- -----------------------------------------------'
--        print '<name>=<base>        __TEXT=0x123000             Section from base address only'
--        print '<name>=<base>-<end>  __TEXT=0x123000-0x124000    Section from base address and end address'
--        print '<name>=<base>+<size> __TEXT=0x123000+0x1000      Section from base address and size'
-+        print('error: invalid section info string "%s"' % s)
-+        print('Valid section info formats are:')
-+        print('Format                Example                    Description')
-+        print('--------------------- -----------------------------------------------')
-+        print('<name>=<base>        __TEXT=0x123000             Section from base address only')
-+        print('<name>=<base>-<end>  __TEXT=0x123000-0x124000    Section from base address and end address')
-+        print('<name>=<base>+<size> __TEXT=0x123000+0x1000      Section from base address and size')
-         return False
- 
-     def __str__(self):
-@@ -261,21 +261,21 @@ class Image:
-         return obj
- 
-     def dump(self, prefix):
--        print "%s%s" % (prefix, self)
-+        print("%s%s" % (prefix, self))
- 
-     def debug_dump(self):
--        print 'path = "%s"' % (self.path)
--        print 'resolved_path = "%s"' % (self.resolved_path)
--        print 'resolved = %i' % (self.resolved)
--        print 'unavailable = %i' % (self.unavailable)
--        print 'uuid = %s' % (self.uuid)
--        print 'section_infos = %s' % (self.section_infos)
--        print 'identifier = "%s"' % (self.identifier)
--        print 'version = %s' % (self.version)
--        print 'arch = %s' % (self.arch)
--        print 'module = %s' % (self.module)
--        print 'symfile = "%s"' % (self.symfile)
--        print 'slide = %i (0x%x)' % (self.slide, self.slide)
-+        print('path = "%s"' % (self.path))
-+        print('resolved_path = "%s"' % (self.resolved_path))
-+        print('resolved = %i' % (self.resolved))
-+        print('unavailable = %i' % (self.unavailable))
-+        print('uuid = %s' % (self.uuid))
-+        print('section_infos = %s' % (self.section_infos))
-+        print('identifier = "%s"' % (self.identifier))
-+        print('version = %s' % (self.version))
-+        print('arch = %s' % (self.arch))
-+        print('module = %s' % (self.module))
-+        print('symfile = "%s"' % (self.symfile))
-+        print('slide = %i (0x%x)' % (self.slide, self.slide))
- 
-     def __str__(self):
-         s = ''
-@@ -428,12 +428,12 @@ class Image:
-                 if self.has_section_load_info():
-                     err = self.load_module(target)
-                     if err:
--                        print 'ERROR: ', err
-+                        print('ERROR: ', err)
-                 return target
-             else:
--                print 'error: unable to create a valid target for (%s) "%s"' % (self.arch, self.path)
-+                print('error: unable to create a valid target for (%s) "%s"' % (self.arch, self.path))
-         else:
--            print 'error: unable to locate main executable (%s) "%s"' % (self.arch, self.path)
-+            print('error: unable to locate main executable (%s) "%s"' % (self.arch, self.path))
-         return None
- 
- 
-@@ -554,7 +554,7 @@ class Symbolicator:
-                     if symbolicated_addresses:
-                         return symbolicated_addresses
-         else:
--            print 'error: no target in Symbolicator'
-+            print('error: no target in Symbolicator')
-         return None
- 
- 
-@@ -602,22 +602,22 @@ def disassemble_instructions(
-             end_idx = inst_idx
-         for i in range(start_idx, end_idx + 1):
-             if i == pc_index:
--                print ' -> ', lines[i]
-+                print(' -> ', lines[i])
-             else:
--                print '    ', lines[i]
-+                print('    ', lines[i])
- 
- 
- def print_module_section_data(section):
--    print section
-+    print(section)
-     section_data = section.GetSectionData()
-     if section_data:
-         ostream = lldb.SBStream()
-         section_data.GetDescription(ostream, section.GetFileAddress())
--        print ostream.GetData()
-+        print(ostream.GetData())
- 
- 
- def print_module_section(section, depth):
--    print section
-+    print(section)
-     if depth > 0:
-         num_sub_sections = section.GetNumSubSections()
-         for sect_idx in range(num_sub_sections):
-@@ -632,7 +632,7 @@ def print_module_sections(module, depth):
- 
- def print_module_symbols(module):
-     for sym in module:
--        print sym
-+        print(sym)
- 
- 
- def Symbolicate(command_args):
-@@ -709,17 +709,17 @@ def Symbolicate(command_args):
- 
-     target = symbolicator.create_target()
-     if options.verbose:
--        print symbolicator
-+        print(symbolicator)
-     if target:
-         for addr_str in args:
-             addr = int(addr_str, 0)
-             symbolicated_addrs = symbolicator.symbolicate(
-                 addr, options.verbose)
-             for symbolicated_addr in symbolicated_addrs:
--                print symbolicated_addr
--            print
-+                print(symbolicated_addr)
-+            print()
-     else:
--        print 'error: no target for %s' % (symbolicator)
-+        print('error: no target for %s' % (symbolicator))
- 
- if __name__ == '__main__':
-     # Create a new debugger instance
--- 
-1.8.3.1
-

SPECS/lldb.spec

@@ -1,33 +1,31 @@
-%global enable_python 1
+#%%global rc_ver 2
+%global lldb_srcdir lldb-%{version}%{?rc_ver:rc%{rc_ver}}.src
 
 Name:		lldb
-Version:	7.0.1
+Version:	8.0.1
-Release:	2%{?dist}
+Release:	1%{?rc_ver:.rc%{rc_ver}}%{?dist}
 Summary:	Next generation high-performance debugger
 
 License:	NCSA
 URL:		http://lldb.llvm.org/
-Source0:	http://llvm.org/releases/%{version}/%{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src.tar.xz
+Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-%{rc_ver}}/%{lldb_srcdir}.tar.xz
 
-ExclusiveArch:  %{arm} aarch64 %{ix86} x86_64
+Patch1:		python3.patch
-
-Patch0:		0001-Convert-symbolication.py-to-python3-using-2to3.patch
 
 BuildRequires:	cmake
-BuildRequires:  llvm-devel = %{version}
+BuildRequires:	llvm-devel = %{version}
-BuildRequires:  clang-devel = %{version}
+BuildRequires:	clang-devel = %{version}
-BuildRequires:  ncurses-devel
+BuildRequires:	ncurses-devel
-BuildRequires:  swig
+BuildRequires:	swig
-BuildRequires:  llvm-static = %{version}
+BuildRequires:	llvm-static = %{version}
-BuildRequires:  libffi-devel
+BuildRequires:	libffi-devel
-BuildRequires:  zlib-devel
+BuildRequires:	zlib-devel
-BuildRequires:  libxml2-devel
+BuildRequires:	libxml2-devel
-BuildRequires:  libedit-devel
+BuildRequires:	libedit-devel
+BuildRequires:	python3-lit
 BuildRequires:  multilib-rpm-config
 
-%if 0%{?enable_python}
+Requires:	python3-lldb
-Requires: python3-lldb
-%endif
 
 %description
 LLDB is a next generation, high-performance debugger. It is built as a set
@@ -42,27 +40,23 @@ Requires:	%{name}%{?_isa} = %{version}-%{release}
 %description devel
 The package contains header files for the LLDB debugger.
 
-%if 0%{?enable_python}
-
 %package -n python3-lldb
+%{?python_provide:%python_provide python3-lldb}
 Summary:	Python module for LLDB
 BuildRequires:	python3-devel
 Requires:	python3-six
-Requires:	lldb = %{version}-%{release}
 
 %description -n python3-lldb
 The package contains the LLDB Python module.
 
-%endif
-
 %prep
-%autosetup -n %{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src -p1
+%setup -q -n %{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src
+
+%patch1 -p1 -b .python
 
-%if 0%{?enable_python}
 # HACK so that lldb can find its custom readline.so, because we move it
 # after install.
 sed -i -e "s~import sys~import sys\nsys.path.insert\(1, '%{python3_sitearch}/lldb'\)~g" source/Interpreter/embedded_interpreter.py
-%endif
 
 %build
 
@@ -70,7 +64,6 @@ mkdir -p _build
 cd _build
 
 # Python version detection is broken
-
 LDFLAGS="%{__global_ldflags} -lpthread -ldl"
 
 CFLAGS="%{optflags} -Wno-error=format-security"
@@ -79,25 +72,23 @@ CXXFLAGS="%{optflags} -Wno-error=format-security"
 %cmake .. \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
-	-DLLVM_CONFIG:FILEPATH=%{_bindir}/llvm-config \
+	-DLLVM_CONFIG:FILEPATH=/usr/bin/llvm-config-%{__isa_bits} \
-	\
-	-DLLDB_PATH_TO_LLVM_BUILD=%{_prefix} \
-	-DLLDB_PATH_TO_CLANG_BUILD=%{_prefix} \
 	\
 	-DLLDB_DISABLE_CURSES:BOOL=OFF \
 	-DLLDB_DISABLE_LIBEDIT:BOOL=OFF \
-%if 0%{?enable_python}
 	-DLLDB_DISABLE_PYTHON:BOOL=OFF \
-%else
-	-DLLDB_DISABLE_PYTHON:BOOL=ON \
-%endif
 %if 0%{?__isa_bits} == 64
-        -DLLVM_LIBDIR_SUFFIX=64 \
+	-DLLVM_LIBDIR_SUFFIX=64 \
 %else
-        -DLLVM_LIBDIR_SUFFIX= \
+	-DLLVM_LIBDIR_SUFFIX= \
 %endif
 	\
-	-DPYTHON_EXECUTABLE:STRING=%{__python3}
+	-DPYTHON_EXECUTABLE:STRING=%{__python3} \
+	-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 \
+	-DLLVM_LIT_ARGS="-sv \
+	--path %{_libdir}/llvm" \
 
 make %{?_smp_mflags}
 
@@ -110,18 +101,16 @@ make install DESTDIR=%{buildroot}
 # remove static libraries
 rm -fv %{buildroot}%{_libdir}/*.a
 
-%if 0%{?enable_python}
 # python: fix binary libraries location
 liblldb=$(basename $(readlink -e %{buildroot}%{_libdir}/liblldb.so))
 ln -vsf "../../../${liblldb}" %{buildroot}%{python3_sitearch}/lldb/_lldb.so
 mv -v %{buildroot}%{python3_sitearch}/readline.so %{buildroot}%{python3_sitearch}/lldb/readline.so
+%py_byte_compile %{__python3} %{buildroot}%{python3_sitearch}/lldb
 
 # remove bundled six.py
 rm -f %{buildroot}%{python3_sitearch}/six.*
-%endif
 
-%post -p /sbin/ldconfig
+%ldconfig_scriptlets
-%postun -p /sbin/ldconfig
 
 %files
 %{_bindir}/lldb*
@@ -132,12 +121,19 @@ rm -f %{buildroot}%{python3_sitearch}/six.*
 %{_includedir}/lldb
 %{_libdir}/*.so
 
-%if 0%{?enable_python}
 %files -n python3-lldb
 %{python3_sitearch}/lldb
-%endif
 
 %changelog
+* Thu Aug 1 2019 sguelton@redhat.com - 8.0.1-1
+- 8.0.1 release
+
+* Thu Jun 13 2019 sguelton@redhat.com - 8.0.1-0.1.rc2
+- 8.0.1rc2 Release
+
+* Tue Apr 16 2019 sguelton@redhat.com - 8.0.0-1
+- 8.0.0 Release
+
 * Mon Dec 17 2018 Tom Stellard <tstellar@redhat.com> - 7.0.1-2
 - Fix multilib conflict