Package: llvm-toolchain-6.0 Version: 1:6.0-1 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu bionic ubuntu-patch
Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * debian/patches/install-lldb-sb-headers.patch: Install lldb's SB headers (pr36630). Thanks to Pavel Labath <lab...@google.com>. LP: #1761009 Thanks for considering the patch. *** /tmp/tmp5CXR4z/llvm-toolchain-6.0_1:6.0-1ubuntu2.debdiff diff -Nru llvm-toolchain-6.0-6.0/debian/patches/install-lldb-sb-headers.patch llvm-toolchain-6.0-6.0/debian/patches/install-lldb-sb-headers.patch --- llvm-toolchain-6.0-6.0/debian/patches/install-lldb-sb-headers.patch 1969-12-31 16:00:00.000000000 -0800 +++ llvm-toolchain-6.0-6.0/debian/patches/install-lldb-sb-headers.patch 2018-04-05 15:05:20.000000000 -0700 @@ -0,0 +1,58 @@ +From 8f577000b2fe2f5bf5d08e352a2f15f9421f9c82 Mon Sep 17 00:00:00 2001 +From: Pavel Labath <lab...@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")) diff -Nru llvm-toolchain-6.0-6.0/debian/patches/series llvm-toolchain-6.0-6.0/debian/patches/series --- llvm-toolchain-6.0-6.0/debian/patches/series 2018-02-27 00:08:44.000000000 -0800 +++ llvm-toolchain-6.0-6.0/debian/patches/series 2018-04-05 15:03:28.000000000 -0700 @@ -47,3 +47,4 @@ silent-llvm-isel-fuzzer.diff test-keep-alive.diff sparc64-add-missing-tls-get-addr.diff +install-lldb-sb-headers.patch -- System Information: Debian Release: buster/sid APT prefers bionic APT policy: (500, 'bionic') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.15.0-13-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled -- Nishanth Aravamudan Ubuntu Server Canonical Ltd