diff --git a/lldb.spec b/lldb.spec index e34b951..ac096f9 100644 --- a/lldb.spec +++ b/lldb.spec @@ -1,12 +1,14 @@ Name: lldb Version: 7.0.0 -Release: 1%{?dist} +Release: 2%{?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 +Patch0: 0001-Convert-symbolication.py-to-python3-using-2to3.patch + BuildRequires: cmake BuildRequires: llvm-devel = %{version} BuildRequires: clang-devel = %{version} @@ -18,7 +20,7 @@ BuildRequires: zlib-devel BuildRequires: libxml2-devel BuildRequires: libedit-devel -Requires: python2-lldb +Requires: python3-lldb %description LLDB is a next generation, high-performance debugger. It is built as a set @@ -33,21 +35,21 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The package contains header files for the LLDB debugger. -%package -n python2-lldb -%{?python_provide:%python_provide python2-lldb} +%package -n python3-lldb +%{?python_provide:%python_provide python3-lldb} Summary: Python module for LLDB -BuildRequires: python2-devel -Requires: python2-six +BuildRequires: python3-devel +Requires: python3-six -%description -n python2-lldb +%description -n python3-lldb The package contains the LLDB Python module. %prep -%setup -q -n %{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src +%autosetup -n %{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src -p1 # 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, '%{python2_sitearch}/lldb'\)~g" source/Interpreter/embedded_interpreter.py +sed -i -e "s~import sys~import sys\nsys.path.insert\(1, '%{python3_sitearch}/lldb'\)~g" source/Interpreter/embedded_interpreter.py %build @@ -78,9 +80,7 @@ CXXFLAGS="%{optflags} -Wno-error=format-security" -DLLVM_LIBDIR_SUFFIX= \ %endif \ - -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") + -DPYTHON_EXECUTABLE:STRING=%{__python3} make %{?_smp_mflags} @@ -93,11 +93,11 @@ rm -fv %{buildroot}%{_libdir}/*.a # python: fix binary libraries location liblldb=$(basename $(readlink -e %{buildroot}%{_libdir}/liblldb.so)) -ln -vsf "../../../${liblldb}" %{buildroot}%{python2_sitearch}/lldb/_lldb.so -mv -v %{buildroot}%{python2_sitearch}/readline.so %{buildroot}%{python2_sitearch}/lldb/readline.so +ln -vsf "../../../${liblldb}" %{buildroot}%{python3_sitearch}/lldb/_lldb.so +mv -v %{buildroot}%{python3_sitearch}/readline.so %{buildroot}%{python3_sitearch}/lldb/readline.so # remove bundled six.py -rm -f %{buildroot}%{python2_sitearch}/six.* +rm -f %{buildroot}%{python3_sitearch}/six.* %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -111,10 +111,13 @@ rm -f %{buildroot}%{python2_sitearch}/six.* %{_includedir}/lldb %{_libdir}/*.so -%files -n python2-lldb -%{python2_sitearch}/lldb +%files -n python3-lldb +%{python3_sitearch}/lldb %changelog +* Wed Oct 03 2018 Tom Stellard - 7.0.0-2 +- Build python module for python3 + * Tue Sep 25 2018 Tom Stellard - 7.0.0-1 - 7.0.0 Release