From bfab69e50a361950d434c10dc3e0ee193422e78e Mon Sep 17 00:00:00 2001
From: serge-sans-paille <sguelton@redhat.com>
Date: Wed, 13 Feb 2019 15:58:07 +0000
Subject: [PATCH] 8.0.0rc1

---
 .gitignore               |  1 +
 0001-Fix-test-deps.patch | 35 +++++++++++++++++++++++++++++++++++
 lldb.spec                | 26 ++++++++++++++++++--------
 sources                  |  2 +-
 4 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 0001-Fix-test-deps.patch

diff --git a/.gitignore b/.gitignore
index ba9a0e9..c010907 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /lldb-7.0.0rc3.src.tar.xz
 /lldb-7.0.0.src.tar.xz
 /lldb-7.0.1.src.tar.xz
+/lldb-8.0.0rc1.src.tar.xz
diff --git a/0001-Fix-test-deps.patch b/0001-Fix-test-deps.patch
new file mode 100644
index 0000000..684d44c
--- /dev/null
+++ b/0001-Fix-test-deps.patch
@@ -0,0 +1,35 @@
+diff -ru lldb-8.0.0rc1.src.orig/lit/CMakeLists.txt lldb-8.0.0rc1.src/lit/CMakeLists.txt
+--- lldb-8.0.0rc1.src.orig/lit/CMakeLists.txt	2019-02-13 13:55:19.983186453 +0000
++++ lldb-8.0.0rc1.src/lit/CMakeLists.txt	2019-02-13 13:58:01.783865287 +0000
+@@ -19,18 +19,23 @@
+ 
+ list(APPEND LLDB_TEST_DEPS
+   LLDBUnitTests
+-  dsymutil
+-  llc
+   lldb
+   lldb-test
+-  llvm-config
+-  llvm-mc
+-  llvm-objcopy
+-  FileCheck
+-  count
+-  not
+   )
+ 
++if (NOT LLDB_BUILT_STANDALONE)
++  list(APPEND LLDB_TEST_DEPS
++    dsymutil
++    llc
++    llvm-config
++    llvm-mc
++    llvm-objcopy
++    FileCheck
++    count
++    not
++    )
++endif()
++
+ if(TARGET lld)
+   list(APPEND LLDB_TEST_DEPS lld)
+ endif()
diff --git a/lldb.spec b/lldb.spec
index 4da5229..abc03e2 100644
--- a/lldb.spec
+++ b/lldb.spec
@@ -1,13 +1,14 @@
-#%%global rc_ver 3
+%global rc_ver 1
 
 Name:		lldb
-Version:	7.0.1
-Release:	1%{?rc_ver:.rc%{rc_ver}}%{?dist}.1
+Version:	8.0.0
+Release:	1%{?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
+Patch0:		0001-Fix-test-deps.patch
 
 BuildRequires:	cmake
 BuildRequires:	llvm-devel = %{version}
@@ -19,6 +20,7 @@ BuildRequires:	libffi-devel
 BuildRequires:	zlib-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	libedit-devel
+BuildRequires:	python2-lit
 
 Requires:	python2-lldb
 
@@ -46,6 +48,7 @@ The package contains the LLDB Python module.
 
 %prep
 %setup -q -n %{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src
+%patch0 -p1 -b .test-dep
 
 # HACK so that lldb can find its custom readline.so, because we move it
 # after install.
@@ -68,9 +71,6 @@ CXXFLAGS="%{optflags} -Wno-error=format-security"
 	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
 	-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 \
 	-DLLDB_DISABLE_PYTHON:BOOL=OFF \
@@ -81,8 +81,14 @@ CXXFLAGS="%{optflags} -Wno-error=format-security"
 %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_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)") \
+	-DLLVM_EXTERNAL_LIT=%{_bindir}/lit \
+	-DLLVM_LIT_ARGS="-sv \
+	-DFileCheck=%{_libdir}/llvm/FileCheck \
+	-Dcount=%{_libdir}/llvm/count \
+	-Dnot=%{_libdir}/llvm/not \
+	--path %{_libdir}/llvm" \
 
 make %{?_smp_mflags}
 
@@ -97,6 +103,7 @@ rm -fv %{buildroot}%{_libdir}/*.a
 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
+%py_byte_compile %{__python2} %{buildroot}%{python2_sitearch}/lldb
 
 # remove bundled six.py
 rm -f %{buildroot}%{python2_sitearch}/six.*
@@ -116,6 +123,9 @@ rm -f %{buildroot}%{python2_sitearch}/six.*
 %{python2_sitearch}/lldb
 
 %changelog
+* Mon Feb 11 2019 sguelton@redhat.com - 8.0.0-1.rc1
+- 8.0.0 Release candidate 1
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.1-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index f0316f2..30fc7be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lldb-7.0.1.src.tar.xz) = 7e98c3148ac34b42404e5aaaff91728d19e9062110a333f0bc7a62ec324fbb6d033ea44b56e144dc1e94febb2107cfb33c71bb3602c2168a6270dd807a2cc5ff
+SHA512 (lldb-8.0.0rc1.src.tar.xz) = 9a7aa21db0d1a129da49606ee97645079c41cbdfb109efb9c33e6751cfff22e15ef6e47089a92b1e249e8a52a12f9f71c1d2efa83d57398f6f4bfaec49a0c0dd