debian/patches/install-lldb-sb-headers.patch: Install lldb's SB headers (pr36630). Thanks to Pavel Labath <labath@google.com>. LP: #1761009

This commit is contained in:
Sylvestre Ledru 2018-04-06 18:47:43 +02:00
parent c0250258a5
commit 176230b3c7
3 changed files with 65 additions and 0 deletions

5
debian/changelog vendored
View File

@ -6,6 +6,11 @@ llvm-toolchain-6.0 (1:6.0-2.1) UNRELEASED; urgency=medium
* Remove sysconf_interceptor_bypass_test.cc because it makes
Debian unstable and Ubuntu bionic freeze
[ Nishanth Aravamudan ]
* debian/patches/install-lldb-sb-headers.patch: Install lldb's
SB headers (pr36630). Thanks to Pavel Labath <labath@google.com>.
LP: #1761009
-- David Tenty <dtenty@ryerson.ca> Sat, 31 Mar 2018 21:11:28 +0000
llvm-toolchain-6.0 (1:6.0-2) unstable; urgency=medium

View File

@ -0,0 +1,58 @@
From 8f577000b2fe2f5bf5d08e352a2f15f9421f9c82 Mon Sep 17 00:00:00 2001
From: Pavel Labath <labath@google.com>
Date: Thu, 8 Mar 2018 15:52:46 +0000
Subject: [PATCH] Install lldb's SB headers (pr36630)
These were removed in r309021 in what looks like an accidentally
committed change. This brings them back.
I also rename the header component to lldb-headers (instead of
lldb_headers) to match the llvm style and add a special
install-lldb-headers target, which installs just the headers.
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@327016 91177308-0d34-0410-b5e6-96231b3b80d8
Origin: upstream, https://github.com/llvm-mirror/lldb/commit/8f577000b2fe2f5bf5d08e352a2f15f9421f9c82.patch
Bug-Ubuntu: https://launchpad.net/bugs/1761009
Forwarded: will be done by Nishanth Aravamudan
Last-Update: 2018-04-05
--- llvm-toolchain-6.0-6.0.orig/lldb/cmake/modules/LLDBConfig.cmake
+++ llvm-toolchain-6.0-6.0/lldb/cmake/modules/LLDBConfig.cmake
@@ -277,27 +277,31 @@ include_directories(BEFORE
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
install(DIRECTORY include/
- COMPONENT lldb_headers
+ COMPONENT lldb-headers
DESTINATION include
FILES_MATCHING
PATTERN "*.h"
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/
- COMPONENT lldb_headers
+ COMPONENT lldb-headers
DESTINATION include
FILES_MATCHING
PATTERN "*.h"
PATTERN ".svn" EXCLUDE
PATTERN ".cmake" EXCLUDE
- PATTERN "lldb-*.h" EXCLUDE
- PATTERN "API/*.h" EXCLUDE
)
+
+ add_custom_target(lldb-headers)
+ set_target_properties(lldb-headers PROPERTIES FOLDER "Misc")
+
+ if (NOT CMAKE_CONFIGURATION_TYPES)
+ add_llvm_install_targets(install-lldb-headers
+ COMPONENT lldb-headers)
+ endif()
endif()
if (NOT LIBXML2_FOUND AND NOT (CMAKE_SYSTEM_NAME MATCHES "Windows"))

View File

@ -48,3 +48,5 @@ silent-llvm-isel-fuzzer.diff
test-keep-alive.diff
sparc64-add-missing-tls-get-addr.diff
remove-test-freezing.diff
install-lldb-sb-headers.patch