[arch-commits] Commit in llvm/trunk (3 files)

[Evangelos Foutras]

    Date: Monday, September 28, 2015 @ 12:28:56
  Author: foutrelis
Revision: 247566

upgpkg: llvm 3.7.0-3

Fix lldb and ship clang-query.

Added:
  llvm/trunk/clang-tools-extra-3.7.0-install-clang-query.patch
  llvm/trunk/lldb-3.7.0-avoid-linking-to-libLLVM.patch
Modified:
  llvm/trunk/PKGBUILD

---------------------------------------------------+
 PKGBUILD                                          |   14 ++++++++++++--
 clang-tools-extra-3.7.0-install-clang-query.patch |    9 +++++++++
 lldb-3.7.0-avoid-linking-to-libLLVM.patch         |   20 ++++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-28 08:20:02 UTC (rev 247565)
+++ PKGBUILD	2015-09-28 10:28:56 UTC (rev 247566)
@@ -12,7 +12,7 @@
 pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'lldb' 'clang' 'clang-analyzer'
          'clang-tools-extra')
 pkgver=3.7.0
-pkgrel=2
+pkgrel=3
 _ocaml_ver=4.02.3
 arch=('i686' 'x86_64')
 url="http://llvm.org/"
@@ -29,6 +29,8 @@
         http://llvm.org/releases/$pkgver/lldb-$pkgver.src.tar.xz{,.sig}
         llvm-3.7.0-link-tools-against-libLLVM.patch
         llvm-3.7.0-export-more-symbols.patch
+        clang-tools-extra-3.7.0-install-clang-query.patch
+        lldb-3.7.0-avoid-linking-to-libLLVM.patch
         llvm-Config-llvm-config.h)
 sha256sums=('ab45895f9dcdad1e140a3a79fd709f64b05ad7364e308c0e582c5b02e9cc3153'
             'SKIP'
@@ -42,6 +44,8 @@
             'SKIP'
             'cf9c8b4d70b4547eda162644658c5c203c3139fcea6c75003b6cd7dc11a8cccc'
             'a1c9f36b97c639666ab6a1bd647a08a027e93e3d3cfd6f5af9c36e757599ce81'
+            '3abf85430c275ecb8dbb526ecb82b1c9f4b4f782a8a43b5a06d040ec0baba7e7'
+            '2d53b6ed4c7620eeade87e7761b98093a0434801ddd599056daed7881141fb01'
             '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
 validpgpkeys=('11E521D646982372EB577A1F8F0871F202119294'
               'B6C8F98282B944E3B0D5C2530FC3042E345AD05D')
@@ -66,6 +70,12 @@
   # https://llvm.org/bugs/show_bug.cgi?id=24157
   patch -Np2 -i ../llvm-3.7.0-export-more-symbols.patch
 
+  # https://llvm.org/bugs/show_bug.cgi?id=24046
+  patch -d tools/clang/tools/extra -Np1 <../clang-tools-extra-3.7.0-install-clang-query.patch
+
+  # https://llvm.org/bugs/show_bug.cgi?id=24953
+  patch -d tools/lldb -Np1 <../lldb-3.7.0-avoid-linking-to-libLLVM.patch
+
   # Use Python 2
   find tools/lldb -name Makefile -exec sed -i 's/python-config/python2-config/' {} +
   sed -i 's|/usr/bin/env python|&2|' \
@@ -171,7 +181,7 @@
 package_lldb() {
   pkgdesc="Next generation, high-performance debugger"
   url="http://lldb.llvm.org/"
-  depends=("llvm-libs=$pkgver-$pkgrel" 'libedit' 'libxml2' 'python2')
+  depends=('libedit' 'libxml2' 'python2')
 
   cd "$srcdir/llvm-$pkgver.src"
 

Added: clang-tools-extra-3.7.0-install-clang-query.patch
===================================================================
--- clang-tools-extra-3.7.0-install-clang-query.patch	                        (rev 0)
+++ clang-tools-extra-3.7.0-install-clang-query.patch	2015-09-28 10:28:56 UTC (rev 247566)
@@ -0,0 +1,9 @@
+diff -upr clang-tools-extra-3.7.0.src.orig/clang-query/tool/CMakeLists.txt clang-tools-extra-3.7.0.src/clang-query/tool/CMakeLists.txt
+--- clang-tools-extra-3.7.0.src.orig/clang-query/tool/CMakeLists.txt	2015-06-20 22:28:07.000000000 +0300
++++ clang-tools-extra-3.7.0.src/clang-query/tool/CMakeLists.txt	2015-09-28 11:51:14.724472237 +0300
+@@ -10,3 +10,5 @@ target_link_libraries(clang-query
+   clangQuery
+   clangTooling
+   )
++
++install(TARGETS clang-query RUNTIME DESTINATION bin)

Added: lldb-3.7.0-avoid-linking-to-libLLVM.patch
===================================================================
--- lldb-3.7.0-avoid-linking-to-libLLVM.patch	                        (rev 0)
+++ lldb-3.7.0-avoid-linking-to-libLLVM.patch	2015-09-28 10:28:56 UTC (rev 247566)
@@ -0,0 +1,20 @@
+diff -upr lldb-3.7.0.src.orig/cmake/modules/AddLLDB.cmake lldb-3.7.0.src/cmake/modules/AddLLDB.cmake
+--- lldb-3.7.0.src.orig/cmake/modules/AddLLDB.cmake	2015-09-28 11:42:23.439084000 +0300
++++ lldb-3.7.0.src/cmake/modules/AddLLDB.cmake	2015-09-28 11:43:03.200237733 +0300
+@@ -56,7 +56,7 @@ macro(add_lldb_library name)
+   if (PARAM_OBJECT)
+     add_library(${name} ${libkind} ${srcs})
+   else()
+-    llvm_add_library(${name} ${libkind} ${srcs})
++    llvm_add_library(${name} ${libkind} DISABLE_LLVM_LINK_LLVM_DYLIB ${srcs})
+ 
+     lldb_link_common_libs(${name} "${libkind}")
+ 
+@@ -93,6 +93,6 @@ macro(add_lldb_library name)
+ endmacro(add_lldb_library)
+ 
+ macro(add_lldb_executable name)
+-  add_llvm_executable(${name} ${ARGN})
++  add_llvm_executable(${name} DISABLE_LLVM_LINK_LLVM_DYLIB ${ARGN})
+   set_target_properties(${name} PROPERTIES FOLDER "lldb executables")
+ endmacro(add_lldb_executable)