allowing llvm's to be co-installable

2 files changed, 56 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d513b04df1b7..ad17206f74d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,3 @@
-# Generated by mksrcinfo v8
-# Tue Apr  3 13:44:49 UTC 2018
 pkgbase = llvm50
 	pkgver = 5.0.1
 	pkgrel = 1
@@ -10,21 +8,28 @@ pkgbase = llvm50
 	makedepends = cmake
 	makedepends = libffi
 	makedepends = python2
-	makedepends = python2-sphinx
+	makedepends = python-sphinx
 	makedepends = libedit
 	makedepends = swig
+	makedepends = icu59
 	options = staticlibs
 	source = https://releases.llvm.org/5.0.1/llvm-5.0.1.src.tar.xz
 	source = https://releases.llvm.org/5.0.1/llvm-5.0.1.src.tar.xz.sig
 	source = https://releases.llvm.org/5.0.1/cfe-5.0.1.src.tar.xz
 	source = https://releases.llvm.org/5.0.1/cfe-5.0.1.src.tar.xz.sig
+	source = https://releases.llvm.org/5.0.1/compiler-rt-5.0.1.src.tar.xz
+	source = https://releases.llvm.org/5.0.1/compiler-rt-5.0.1.src.tar.xz.sig
 	source = 0001-GCC-compatibility-Ignore-the-fno-plt-flag.patch
 	source = 0002-Enable-SSP-and-PIE-by-default.patch
 	source = disable-llvm-symbolizer-test.patch
+	validpgpkeys = B6C8F98282B944E3B0D5C2530FC3042E345AD05D
+	validpgpkeys = 11E521D646982372EB577A1F8F0871F202119294
 	sha256sums = 5fa7489fc0225b11821cab0362f5813a05f2bcf2533e8a4ea9c9c860168807b0
 	sha256sums = SKIP
 	sha256sums = 135f6c9b0cd2da1aff2250e065946258eb699777888df39ca5a5b4fe5e23d0ff
 	sha256sums = SKIP
+	sha256sums = 4edd1417f457a9b3f0eb88082530490edf3cf6a7335cdce8ecbc5d3e16a895da
+	sha256sums = SKIP
 	sha256sums = a1ba7fb859ac157c4b4342435cd656e29b1e1d9bddcb8ae0158a91c0a8ba6203
 	sha256sums = 186f2d10b013395f2dd6e1fd3baf4961a2e40c403f115517c9b253682934f50f
 	sha256sums = 6fff47ab5ede79d45fe64bb4903b7dfc27212a38e6cd5d01e60ebd24b7557359
@@ -34,7 +39,6 @@ pkgname = llvm50
 	pkgdesc = Low Level Virtual Machine
 	depends = llvm50-libs
 	depends = perl
-	conflicts = llvm
 
 pkgname = llvm50-libs
 	pkgdesc = Low Level Virtual Machine (runtime libraries)
@@ -51,5 +55,4 @@ pkgname = clang50
 	depends = gcc
 	depends = libxml2
 	optdepends = openmp: OpenMP support in clang with -fopenmp
-	conflicts = clang
 
diff --git a/PKGBUILD b/PKGBUILD
index 3caa9231af1b..eba35dbb2932 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,18 +8,21 @@
 # Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
+# Contributor: Ruben Van Boxem <vanboxem.ruben@gmail.com>
 
 pkgname=('llvm50' 'llvm50-libs' 'clang50')
 pkgver=5.0.1
 pkgrel=1
+_prefix="/usr/lib/llvm-5.0"
 arch=('i686' 'x86_64')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
-makedepends=('cmake' 'libffi' 'python2' 'python2-sphinx' 'libedit' 'swig')
+makedepends=('cmake' 'libffi' 'python2' 'python-sphinx' 'libedit' 'swig' 'icu59')
 makedepends_x86_64=('gcc-multilib')
 options=('staticlibs')
 source=(https://releases.llvm.org/$pkgver/llvm-$pkgver.src.tar.xz{,.sig}
         https://releases.llvm.org/$pkgver/cfe-$pkgver.src.tar.xz{,.sig}
+        https://releases.llvm.org/$pkgver/compiler-rt-$pkgver.src.tar.xz{,.sig}
         0001-GCC-compatibility-Ignore-the-fno-plt-flag.patch
         0002-Enable-SSP-and-PIE-by-default.patch
         disable-llvm-symbolizer-test.patch)
@@ -27,6 +30,8 @@ sha256sums=('5fa7489fc0225b11821cab0362f5813a05f2bcf2533e8a4ea9c9c860168807b0'
             'SKIP'
             '135f6c9b0cd2da1aff2250e065946258eb699777888df39ca5a5b4fe5e23d0ff'
             'SKIP'
+            '4edd1417f457a9b3f0eb88082530490edf3cf6a7335cdce8ecbc5d3e16a895da'
+            'SKIP'
             'a1ba7fb859ac157c4b4342435cd656e29b1e1d9bddcb8ae0158a91c0a8ba6203'
             '186f2d10b013395f2dd6e1fd3baf4961a2e40c403f115517c9b253682934f50f'
             '6fff47ab5ede79d45fe64bb4903b7dfc27212a38e6cd5d01e60ebd24b7557359')
@@ -38,6 +43,7 @@ prepare() {
   mkdir build
 
   mv "$srcdir/cfe-$pkgver.src" tools/clang
+  mv "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt
 
   # Disable test that fails when compiled as PIE
   # https://bugs.llvm.org/show_bug.cgi?id=31870
@@ -51,56 +57,69 @@ prepare() {
 build() {
   cd "$srcdir/llvm-$pkgver.src/build"
 
-  cmake .. \
+  cmake \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_PREFIX="${_prefix}" \
     -DLLVM_BUILD_LLVM_DYLIB=ON \
     -DLLVM_LINK_LLVM_DYLIB=ON \
     -DLLVM_INSTALL_UTILS=ON \
     -DLLVM_ENABLE_RTTI=ON \
     -DLLVM_ENABLE_FFI=ON \
-    -DLLVM_TOOL_LLGO_BUILD=ON \
     -DLLVM_BUILD_TESTS=ON \
     -DLLVM_ENABLE_DOXYGEN=OFF \
     -DCLANG_INSTALL_SCANBUILD=OFF \
     -DCLANG_INSTALL_SCANVIEW=OFF \
     -DFFI_INCLUDE_DIR=$(pkg-config --variable=includedir libffi) \
-    -DLLVM_BINUTILS_INCDIR=/usr/include 
+    -DLLVM_BINUTILS_INCDIR=/usr/include \
+    ..
 
   make
-  make ocaml_doc
+
   # Disable automatic installation of components that go into subpackages
   sed -i '/clang\/cmake_install.cmake/d' tools/cmake_install.cmake
+  sed -i '/extra\/cmake_install.cmake/d' tools/clang/tools/cmake_install.cmake
+  sed -i '/compiler-rt\/cmake_install.cmake/d' projects/cmake_install.cmake
 }
 
-#check() {
-#  cd "$srcdir/llvm-$pkgver.src/build"
-#  make check-{llvm,clang}
-#}
+check() {
+  cd "$srcdir/llvm-$pkgver.src/build"
+  #make check-{llvm,clang}
+}
 
 package_llvm50() {
   pkgdesc="Low Level Virtual Machine"
   depends=('llvm50-libs' 'perl')
-  conflicts=('llvm')
+  
   cd "$srcdir/llvm-$pkgver.src"
 
   make -C build DESTDIR="$pkgdir" install
+
   # The runtime libraries go into llvm-libs
-  rm -rf "$pkgdir/usr/lib/ocaml"
-  rm -rf "$pkgdir/usr/share/doc/$pkgname/ocaml-html"
-  mv -f "$pkgdir"/usr/lib/libLLVM*.so* "$srcdir"
-  rm "$pkgdir"/usr/lib/{LLVMgold,libLTO}.so
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  mv -f "${pkgdir}${_prefix}"/lib/lib{LLVM,LTO}*.so* "$srcdir"
+  mv -f "${pkgdir}${_prefix}"/lib/LLVMgold.so "$srcdir"
+
+  install -Dm644 LICENSE.TXT "${pkgdir}${_prefix}/share/licenses/llvm/LICENSE"
+
+  # add symbolic links in /usr/bin
+  mkdir -p "$pkgdir/usr/bin"
+  cd "${pkgdir}${_prefix}"/bin
+  for f in *; do
+    ln -s "${_prefix}/bin/$f" "$pkgdir/usr/bin/${f%-5.0}-5.0"
+  done
 }
 
 package_llvm50-libs() {
   pkgdesc="Low Level Virtual Machine (runtime libraries)"
   depends=('gcc-libs' 'zlib' 'libffi' 'libedit' 'ncurses')
-  install -d "$pkgdir/usr/lib"
-  cp -P "$srcdir"/libLLVM*.so* $pkgdir/usr/lib/
-  rm "$pkgdir"/usr/lib/libLLVM.so
+
+  install -d "${pkgdir}${_prefix}/lib"
+  cp -P \
+    "$srcdir"/lib{LLVM,LTO}*.so* \
+    "$srcdir"/LLVMgold.so \
+    "${pkgdir}${_prefix}/lib/"
+
   install -Dm644 "$srcdir/llvm-$pkgver.src/LICENSE.TXT" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    "${pkgdir}${_prefix}/share/licenses/llvm-libs/LICENSE"
 }
 
 package_clang50() {
@@ -108,12 +127,19 @@ package_clang50() {
   url="http://clang.llvm.org/"
   depends=('llvm50-libs' 'gcc' 'libxml2')
   optdepends=('openmp: OpenMP support in clang with -fopenmp')
-  conflicts=('clang')
 
   cd "$srcdir/llvm-$pkgver.src"
 
   make -C build/tools/clang DESTDIR="$pkgdir" install
+  make -C build/projects/compiler-rt DESTDIR="$pkgdir" install
   install -Dm644 tools/clang/LICENSE.TXT \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    
+  # add symbolic links in /usr/bin
+  mkdir -p "$pkgdir/usr/bin"
+  cd "${pkgdir}${_prefix}"/bin
+  for f in *; do
+    ln -f -s "${_prefix}/bin/$f" "$pkgdir/usr/bin/${f%-5.0}-5.0"
+  done
 }
-# vim:set ts=2 sw=2 et:
+# vim:set ts=2 sw=2 et:
\ No newline at end of file