[arch-commits] Commit in llvm6/trunk (PKGBUILD)

[Evangelos Foutras]

    Date: Saturday, September 29, 2018 @ 10:26:32
  Author: foutrelis
Revision: 335531

upgpkg: llvm6 6.0.1-2

Move libLTO to llvm6-libs and include lit in llvm6.

Modified:
  llvm6/trunk/PKGBUILD

----------+
 PKGBUILD |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-29 09:33:21 UTC (rev 335530)
+++ PKGBUILD	2018-09-29 10:26:32 UTC (rev 335531)
@@ -9,12 +9,12 @@
 
 pkgname=('llvm6' 'llvm6-libs')
 pkgver=6.0.1
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
 makedepends=('cmake' 'ninja' 'libffi' 'libedit' 'ncurses' 'libxml2'
-             'python')
+             'python-setuptools')
 options=('staticlibs')
 source=(https://releases.llvm.org/$pkgver/llvm-$pkgver.src.tar.xz{,.sig}
         D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch
@@ -63,6 +63,7 @@
 package_llvm6() {
   pkgdesc="Collection of modular and reusable compiler and toolchain technologies"
   depends=('llvm6-libs' 'perl')
+  optdepends=('python-setuptools: for using lit (LLVM Integrated Tester)')
   conflicts=('llvm')
 
   cd "$srcdir/llvm-$pkgver.src/build"
@@ -69,9 +70,14 @@
 
   DESTDIR="$pkgdir" ninja install
 
-  # The runtime library go into llvm6-libs
-  mv -f "$pkgdir"/usr/lib/libLLVM-*.so "$srcdir"
+  # Include lit for running lit-based tests in other projects
+  pushd ../utils/lit
+  python3 setup.py install --root="$pkgdir" -O1
+  popd
 
+  # The runtime libraries go into llvm6-libs
+  mv -f "$pkgdir"/usr/lib/lib{LLVM-*.so,LTO.so.*} "$srcdir"
+
   # Remove files which conflict with llvm-libs
   rm "$pkgdir"/usr/lib/{LLVMgold,lib{LLVM,LTO}}.so
 
@@ -83,7 +89,7 @@
   depends=('gcc-libs' 'zlib' 'libffi' 'libedit' 'ncurses' 'libxml2')
 
   install -d "$pkgdir/usr/lib"
-  cp -P "$srcdir"/libLLVM-*.so "$pkgdir/usr/lib/"
+  cp -P "$srcdir"/lib{LLVM-*.so,LTO.so.*} "$pkgdir/usr/lib/"
 
   install -Dm644 "$srcdir/llvm-$pkgver.src/LICENSE.TXT" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"