Date: Thursday, September 20, 2018 @ 03:42:24 Author: foutrelis Revision: 335057
upgpkg: lldb 7.0.0-1 New upstream release. Modified: lldb/trunk/PKGBUILD Deleted: lldb/trunk/PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch ----------------------------------------------------------+ PKGBUILD | 13 --- PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch | 54 ------------- 2 files changed, 4 insertions(+), 63 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-09-20 03:32:32 UTC (rev 335056) +++ PKGBUILD 2018-09-20 03:42:24 UTC (rev 335057) @@ -2,7 +2,7 @@ # Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com> pkgname=lldb -pkgver=6.0.1 +pkgver=7.0.0 pkgrel=1 pkgdesc="Next generation, high-performance debugger" arch=('x86_64') @@ -10,11 +10,9 @@ license=('custom:University of Illinois/NCSA Open Source License') depends=('llvm-libs' 'clang' 'python2' 'python2-six') makedepends=('llvm' 'cmake' 'ninja' 'swig') -source=(https://releases.llvm.org/$pkgver/$pkgname-$pkgver.src.tar.xz{,.sig} - PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch) -sha256sums=('6b8573841f2f7b60ffab9715c55dceff4f2a44e5a6d590ac189d20e8e7472714' - 'SKIP' - '1f146b2009553c6a5f76fa077b621fba66db5ef26c9790e9f64e608304d099e5') +source=(https://releases.llvm.org/$pkgver/$pkgname-$pkgver.src.tar.xz{,.sig}) +sha256sums=('7ff6d8fee49977d25b3b69be7d22937b92592c7609cf283ed0dcf9e5cd80aa32' + 'SKIP') validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <h...@chromium.org> validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstel...@redhat.com> @@ -21,9 +19,6 @@ prepare() { cd "$srcdir/$pkgname-$pkgver.src" mkdir build - - # https://bugs.llvm.org/show_bug.cgi?id=36687 - patch -Np1 -i ../PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch } build() { Deleted: PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch =================================================================== --- PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch 2018-09-20 03:32:32 UTC (rev 335056) +++ PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch 2018-09-20 03:42:24 UTC (rev 335057) @@ -1,54 +0,0 @@ -From 39c65fb3ea6ddbec92b32efa1a7fbd0fb299ce63 Mon Sep 17 00:00:00 2001 -From: Pavel Labath <lab...@google.com> -Date: Wed, 14 Mar 2018 10:08:21 +0000 -Subject: [PATCH] [cmake] Fix standalone+LLVM_LINK_LLVM_DYLIB builds (pr36687) - -Summary: -To make this build work, I needed to add detection code for the pthread -library. This is necessary, because we have direct calls to these -libraries (instead of going through llvm) and in the standalone build we -cannot rely on llvm to detect these for us. In a standalone non-dylib -build this was accidentaly working because these libraries were pulled -in as an interface dependency of the .a files, but in a dylib build -these are no longer part of the link interface, and so we need to add -them explicitly. - -Reviewers: krytarowski, zturner - -Subscribers: lldb-commits, mgorny - -Differential Revision: https://reviews.llvm.org/D44379 - -git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@327490 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - cmake/modules/LLDBConfig.cmake | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake -index 24878b5913..32effe7737 100644 ---- a/cmake/modules/LLDBConfig.cmake -+++ b/cmake/modules/LLDBConfig.cmake -@@ -346,14 +346,18 @@ else() - - endif() - --if (HAVE_LIBPTHREAD) -- list(APPEND system_libs pthread) --endif(HAVE_LIBPTHREAD) -+if( WIN32 AND NOT CYGWIN ) -+ set(PURE_WINDOWS 1) -+endif() - --if (HAVE_LIBDL) -- list(APPEND system_libs ${CMAKE_DL_LIBS}) -+if(NOT PURE_WINDOWS) -+ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) -+ find_package(Threads REQUIRED) -+ list(APPEND system_libs ${CMAKE_THREAD_LIBS_INIT}) - endif() - -+list(APPEND system_libs ${CMAKE_DL_LIBS}) -+ - # Figure out if lldb could use lldb-server. If so, then we'll - # ensure we build lldb-server when an lldb target is being built. - if (CMAKE_SYSTEM_NAME MATCHES "Android|Darwin|FreeBSD|Linux|NetBSD")