[arch-commits] Commit in lldb/repos/staging-x86_64 (5 files)
Evangelos Foutras
foutrelis at archlinux.org
Sat Mar 17 01:43:25 UTC 2018
Date: Saturday, March 17, 2018 @ 01:43:25
Author: foutrelis
Revision: 319541
archrelease: copy trunk to staging-x86_64
Added:
lldb/repos/staging-x86_64/PKGBUILD
(from rev 319540, lldb/trunk/PKGBUILD)
lldb/repos/staging-x86_64/PR36630-install-lldb-SB-headers.patch
(from rev 319540, lldb/trunk/PR36630-install-lldb-SB-headers.patch)
lldb/repos/staging-x86_64/PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch
(from rev 319540, lldb/trunk/PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch)
Deleted:
lldb/repos/staging-x86_64/PKGBUILD
lldb/repos/staging-x86_64/PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch
----------------------------------------------------------+
PKGBUILD | 134 ++++++-------
PR36630-install-lldb-SB-headers.patch | 59 +++++
PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch | 108 +++++-----
3 files changed, 184 insertions(+), 117 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-17 01:43:18 UTC (rev 319540)
+++ PKGBUILD 2018-03-17 01:43:25 UTC (rev 319541)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
-
-pkgname=lldb
-pkgver=6.0.0
-pkgrel=3
-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=('46f54c1d7adcd047d87c0179f7b6fa751614f339f4f87e60abceaa45f414d454'
- 'SKIP'
- '1f146b2009553c6a5f76fa077b621fba66db5ef26c9790e9f64e608304d099e5')
-validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at chromium.org>
-validpgpkeys+=('11E521D646982372EB577A1F8F0871F202119294') # Tom Stellard <tom at stellard.net>
-
-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"
-
- # 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/staging-x86_64/PKGBUILD (from rev 319540, lldb/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-03-17 01:43:25 UTC (rev 319541)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
+
+pkgname=lldb
+pkgver=6.0.0
+pkgrel=4
+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}
+ PR36630-install-lldb-SB-headers.patch
+ PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch)
+sha256sums=('46f54c1d7adcd047d87c0179f7b6fa751614f339f4f87e60abceaa45f414d454'
+ 'SKIP'
+ '5b765f7420bbf3fb4521a2f2022a40ba4f703ab555fe61e88a6d6617a6713921'
+ '1f146b2009553c6a5f76fa077b621fba66db5ef26c9790e9f64e608304d099e5')
+validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at chromium.org>
+validpgpkeys+=('11E521D646982372EB577A1F8F0871F202119294') # Tom Stellard <tom at stellard.net>
+
+prepare() {
+ 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
+}
+
+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/staging-x86_64/PR36630-install-lldb-SB-headers.patch (from rev 319540, lldb/trunk/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:25 UTC (rev 319541)
@@ -0,0 +1,59 @@
+From 8f577000b2fe2f5bf5d08e352a2f15f9421f9c82 Mon Sep 17 00:00:00 2001
+From: Pavel Labath <labath at 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"))
Deleted: PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch
===================================================================
--- PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch 2018-03-17 01:43:18 UTC (rev 319540)
+++ PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch 2018-03-17 01:43:25 UTC (rev 319541)
@@ -1,54 +0,0 @@
-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")
Copied: lldb/repos/staging-x86_64/PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch (from rev 319540, lldb/trunk/PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch)
===================================================================
--- PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch (rev 0)
+++ PR36687-fix-standalone-LLVM_LINK_LLVM_DYLIB-builds.patch 2018-03-17 01:43:25 UTC (rev 319541)
@@ -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")
More information about the arch-commits
mailing list