Restore LLDB SB API headers, fixes rhbz#1548758

This commit is contained in:
Tilmann Scheller 2018-03-08 08:52:49 -06:00 committed by Tom Stellard
parent 6f4f23f0f5
commit 44958ca9de
2 changed files with 44 additions and 1 deletions

View File

@ -0,0 +1,37 @@
From 2c77a3551b39aa26268630d3b626b811f2cff029 Mon Sep 17 00:00:00 2001
From: Tilmann Scheller <tschelle@redhat.com>
Date: Thu, 8 Mar 2018 08:35:29 -0600
Subject: [PATCH] Partially revert "[CMake] Cleanup unnecessary definition"
This reverts the part of r309021 that broke LLDB SB API header installation.
See rhbz#1548758 for more details.
---
cmake/modules/LLDBConfig.cmake | 4 ----
1 file changed, 4 deletions(-)
diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake
index 8f75880df..7846ec1bd 100644
--- a/cmake/modules/LLDBConfig.cmake
+++ b/cmake/modules/LLDBConfig.cmake
@@ -284,8 +284,6 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
PATTERN ".svn" EXCLUDE
PATTERN ".cmake" EXCLUDE
PATTERN "Config.h" EXCLUDE
- PATTERN "lldb-*.h" EXCLUDE
- PATTERN "API/*.h" EXCLUDE
)
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/
@@ -295,8 +293,6 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
PATTERN "*.h"
PATTERN ".svn" EXCLUDE
PATTERN ".cmake" EXCLUDE
- PATTERN "lldb-*.h" EXCLUDE
- PATTERN "API/*.h" EXCLUDE
)
endif()
--
2.14.3

View File

@ -1,11 +1,12 @@
Name: lldb
Version: 6.0.0
Release: 1%{?dist}
Release: 2%{?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
Patch0: 0001-Partially-revert-CMake-Cleanup-unnecessary-definitio.patch
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
@ -45,6 +46,8 @@ The package contains the LLDB Python module.
%prep
%setup -q -n %{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src
%patch0 -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, '%{python_sitearch}/lldb'\)~g" source/Interpreter/embedded_interpreter.py
@ -115,6 +118,9 @@ rm -f %{buildroot}%{python_sitearch}/six.*
%{python_sitearch}/lldb
%changelog
* 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