[arch-commits] Commit in lldb/repos (3 files)

[Evangelos Foutras]

    Date: Sunday, July 8, 2018 @ 17:11:15
  Author: foutrelis
Revision: 328099

archrelease: copy trunk to testing-x86_64

Added:
  lldb/repos/testing-x86_64/
  lldb/repos/testing-x86_64/PKGBUILD
    (from rev 328098, lldb/trunk/PKGBUILD)
  lldb/repos/testing-x86_64/PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch
    (from rev 328098, lldb/trunk/PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch)

----------------------------------------------------------+
 PKGBUILD                                                 |   66 +++++++++++++
 PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch |   54 ++++++++++
 2 files changed, 120 insertions(+)

Copied: lldb/repos/testing-x86_64/PKGBUILD (from rev 328098, lldb/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2018-07-08 17:11:15 UTC (rev 328099)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
+
+pkgname=lldb
+pkgver=6.0.1
+pkgrel=1
+pkgdesc="Next generation, high-performance debugger"
+arch=('x86_64')
+url="https://lldb.llvm.org/"
+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')
+validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at chromium.org>
+validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar at redhat.com>
+
+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() {
+  cd "$srcdir/$pkgname-$pkgver.src/build"
+
+  cmake .. -G Ninja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+    -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
+    -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
+    -DLLVM_LINK_LLVM_DYLIB=ON \
+    -DLLDB_USE_SYSTEM_SIX=1
+  ninja
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver.src/build"
+
+  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
+
+  # Relocate custom readline.so module which links agaisnt libedit
+  mv "$pkgdir"/usr/lib/python2.7/site-packages/{,lldb/}readline.so
+  sed -i '2isys.path.insert(1, "/usr/lib/python2.7/site-packages/lldb")' \
+    "$pkgdir/usr/lib/python2.7/site-packages/lldb/embedded_interpreter.py"
+
+  # Compile Python scripts
+  python2 -m compileall "$pkgdir"
+  python2 -O -m compileall "$pkgdir"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: lldb/repos/testing-x86_64/PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch (from rev 328098, lldb/trunk/PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch)
===================================================================
--- testing-x86_64/PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch	                        (rev 0)
+++ testing-x86_64/PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch	2018-07-08 17:11:15 UTC (rev 328099)
@@ -0,0 +1,54 @@
+From 39c65fb3ea6ddbec92b32efa1a7fbd0fb299ce63 Mon Sep 17 00:00:00 2001
+From: Pavel Labath <labath at 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")