Date: Saturday, March 17, 2018 @ 01:43:18 Author: foutrelis Revision: 319540
upgpkg: lldb 6.0.0-4 - Fix missing SB API headers (https://bugs.llvm.org/show_bug.cgi?id=36630) - Install docs/lldb.1 man page (possibly outdated but better than nothing) Added: lldb/trunk/PR36630-install-lldb-SB-headers.patch Modified: lldb/trunk/PKGBUILD ---------------------------------------+ PKGBUILD | 10 ++++- PR36630-install-lldb-SB-headers.patch | 59 ++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-03-16 19:14:04 UTC (rev 319539) +++ PKGBUILD 2018-03-17 01:43:18 UTC (rev 319540) @@ -4,7 +4,7 @@ pkgname=lldb pkgver=6.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="Next generation, high-performance debugger" arch=('x86_64') url="https://lldb.llvm.org/" @@ -12,9 +12,11 @@ depends=('llvm-libs' 'clang' 'python2' 'python2-six') makedepends=('llvm' 'cmake' 'ninja' 'swig') source=(https://releases.llvm.org/$pkgver/$pkgname-$pkgver.src.tar.xz{,.sig} + PR36630-install-lldb-SB-headers.patch PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch) sha256sums=('46f54c1d7adcd047d87c0179f7b6fa751614f339f4f87e60abceaa45f414d454' 'SKIP' + '5b765f7420bbf3fb4521a2f2022a40ba4f703ab555fe61e88a6d6617a6713921' '1f146b2009553c6a5f76fa077b621fba66db5ef26c9790e9f64e608304d099e5') validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <h...@chromium.org> validpgpkeys+=('11E521D646982372EB577A1F8F0871F202119294') # Tom Stellard <t...@stellard.net> @@ -23,6 +25,9 @@ cd "$srcdir/$pkgname-$pkgver.src" mkdir build + # https://bugs.llvm.org/show_bug.cgi?id=36630 + patch -Np1 -i ../PR36630-install-lldb-SB-headers.patch + # https://bugs.llvm.org/show_bug.cgi?id=36687 patch -Np1 -i ../PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch } @@ -47,6 +52,9 @@ DESTDIR="$pkgdir" ninja install install -Dm644 ../LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # Install possibly outdated man page; better than nothing! + install -Dm644 ../docs/lldb.1 "$pkgdir/usr/share/man/man1/lldb.1" + # Remove static libraries rm "$pkgdir"/usr/lib/*.a Added: PR36630-install-lldb-SB-headers.patch =================================================================== --- PR36630-install-lldb-SB-headers.patch (rev 0) +++ PR36630-install-lldb-SB-headers.patch 2018-03-17 01:43:18 UTC (rev 319540) @@ -0,0 +1,59 @@ +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 +--- + cmake/modules/LLDBConfig.cmake | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake +index 8f75880dfb..24878b5913 100644 +--- a/cmake/modules/LLDBConfig.cmake ++++ b/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"))