lldb should depend on python2-lldb

rhbz#1567262

.gitignore

@@ -11,3 +11,5 @@
 /lldb-6.0.0rc1.src.tar.xz
 /lldb-6.0.0rc2.src.tar.xz
 /lldb-6.0.0.src.tar.xz
+/lldb-6.0.1rc1.src.tar.xz
+/lldb-6.0.1.src.tar.xz

lldb.spec

@@ -1,6 +1,6 @@
 Name:		lldb
-Version:	6.0.0
-Release:	1%{?dist}
+Version:	6.0.1
+Release:	2%{?dist}
 Summary:	Next generation high-performance debugger
 
 License:	NCSA
@@ -20,6 +20,8 @@ BuildRequires:  zlib-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  libedit-devel
 
+Requires: python2-lldb
+
 %description
 LLDB is a next generation, high-performance debugger. It is built as a set
 of reusable components which highly leverage existing libraries in the
@@ -47,7 +49,7 @@ The package contains the LLDB Python module.
 
 # 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, '%{python_sitearch}/lldb'\)~g" source/Interpreter/embedded_interpreter.py
+sed -i -e "s~import sys~import sys\nsys.path.insert\(1, '%{python2_sitearch}/lldb'\)~g" source/Interpreter/embedded_interpreter.py
 
 %build
 
@@ -78,9 +80,9 @@ CXXFLAGS="%{optflags} -Wno-error=format-security"
         -DLLVM_LIBDIR_SUFFIX= \
 %endif
 	\
-	-DPYTHON_EXECUTABLE:STRING=%{__python} \
-	-DPYTHON_VERSION_MAJOR:STRING=$(%{__python} -c "import sys; print sys.version_info.major") \
-	-DPYTHON_VERSION_MINOR:STRING=$(%{__python} -c "import sys; print sys.version_info.minor")
+	-DPYTHON_EXECUTABLE:STRING=%{__python2} \
+	-DPYTHON_VERSION_MAJOR:STRING=$(%{__python2} -c "import sys; print sys.version_info.major") \
+	-DPYTHON_VERSION_MINOR:STRING=$(%{__python2} -c "import sys; print sys.version_info.minor")
 
 make %{?_smp_mflags}
 
@@ -93,11 +95,11 @@ rm -fv %{buildroot}%{_libdir}/*.a
 
 # python: fix binary libraries location
 liblldb=$(basename $(readlink -e %{buildroot}%{_libdir}/liblldb.so))
-ln -vsf "../../../${liblldb}" %{buildroot}%{python_sitearch}/lldb/_lldb.so
-mv -v %{buildroot}%{python_sitearch}/readline.so %{buildroot}%{python_sitearch}/lldb/readline.so
+ln -vsf "../../../${liblldb}" %{buildroot}%{python2_sitearch}/lldb/_lldb.so
+mv -v %{buildroot}%{python2_sitearch}/readline.so %{buildroot}%{python2_sitearch}/lldb/readline.so
 
 # remove bundled six.py
-rm -f %{buildroot}%{python_sitearch}/six.*
+rm -f %{buildroot}%{python2_sitearch}/six.*
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -112,9 +114,28 @@ rm -f %{buildroot}%{python_sitearch}/six.*
 %{_libdir}/*.so
 
 %files -n python2-lldb
-%{python_sitearch}/lldb
+%{python2_sitearch}/lldb
 
 %changelog
+* Fri Sep 21 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-2
+- lldb should depend on python2-lldb
+
+* Mon May 21 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-1
+- 6.0.1 Release
+
+* Mon May 21 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-0.1.rc1
+- 6.0.1-rc1 Release
+
+* Sat May 05 2018 Miro Hrončok <mhroncok@redhat.com> - 6.0.0-4
+- Update Python macros to new packaging standards
+  (See https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build)
+
+* Tue Mar 20 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-3
+- Rebuild against llvm with the rhbz#1558657 fix
+
+* Wed Mar 14 2018 Tilmann Scheller <tschelle@redhat.com> - 6.0.0-2
+- Restore LLDB SB API headers, fixes rhbz#1548758
+
 * Fri Mar 09 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-1
 - 6.0.0 Release
 

sources

@@ -1 +1 @@
-SHA512 (lldb-6.0.0.src.tar.xz) = 9679d1dda0c71681b1f8c5a22e775c0262de26dc5b091e1db189968b97ed3aed45991381d529b3fd4b3ab28112453f519045485708f97f765d3e3131b2a918b7
+SHA512 (lldb-6.0.1.src.tar.xz) = 93ee2efea07276f8838bc2b3ff039cab8c7a1a6965647aaa4dee99f55c6465d5584ed3be87b144e2e32b5acc7db9cec56d89404de764a2f53643ed154d213721

tests/python-embedded-interpreter/runtest.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -ex
+
+g++ -g test.cpp
+
+test `lldb -b -o 'breakpoint set --file test.cpp --line 7' -o run -o 'p v' -- a.out \
+  | grep \
+    -e '(std::vector<int, std::allocator<int> >) $0 = size=1 {' \
+    -e '\[0\] = 2' \
+  | wc -l` -eq 2

tests/python-embedded-interpreter/test.cpp

@@ -0,0 +1,9 @@
+#include <stdio.h>
+#include <vector>
+int
+main ()
+{
+  std::vector<int> v (1, 2);
+  std::vector<int>::iterator it(v.begin());
+  return 0;
+}

tests/tests.yml

@@ -0,0 +1,25 @@
+- hosts: localhost
+  pre_tasks:
+  # We want to be able to check that the sub-package dependencies are correct.
+  # The CI system installs all sub-packages, so we remove them so we can
+  # test them individually.
+  - name: Remove RPMS installed by CI
+    package:
+      name:
+        - python2-lldb
+        - lldb
+        - lldb-devel
+      state: absent
+    tags: classic
+  roles:
+  - role: standard-test-basic
+    tags:
+      - classic
+    required_packages:
+      - gcc-c++
+      - lldb
+    tests:
+      # rhbz#1567262
+      - python-embedded-interpreter:
+          dir: python-embedded-interpreter
+          run: ./runtest.sh