Install in /usr/lib/llvm-4.0 to avoid conflicts

2 files changed, 27 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 360699c8395c..d21efebcd9c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Wed Oct 25 05:54:16 UTC 2017
 pkgbase = llvm40
 	pkgver = 4.0.1
-	pkgrel = 3
+	pkgrel = 4
 	url = http://llvm.org/
 	arch = i686
 	arch = x86_64
@@ -20,7 +22,6 @@ pkgbase = llvm40
 	source = 0002-Enable-SSP-and-PIE-by-default.patch
 	source = 0003-Fix-sanitizer-build-against-latest-glibc.patch
 	source = disable-llvm-symbolizer-test.patch
-	validpgpkeys = 11E521D646982372EB577A1F8F0871F202119294
 	sha256sums = da783db1f82d516791179fe103c71706046561f7972b18f0049242dee6712b51
 	sha256sums = SKIP
 	sha256sums = 61738a735852c23c3bdbe52d035488cdb2083013f384d67c1ba36fabebd8769b
@@ -36,11 +37,6 @@ pkgname = llvm40
 	pkgdesc = Low Level Virtual Machine
 	depends = llvm40-libs
 	depends = perl
-	conflicts = llvm
-	conflicts = llvm33
-	conflicts = llvm35
-	conflicts = llvm38
-	conflicts = llvm39
 
 pkgname = llvm40-libs
 	pkgdesc = Low Level Virtual Machine (runtime libraries)
@@ -58,8 +54,4 @@ pkgname = clang40
 	depends = libxml2
 	optdepends = openmp: OpenMP support in clang with -fopenmp
 	optdepends = python2: for scan-view and git-clang-format
-	conflicts = clang
-	conflicts = clang35
-	conflicts = clang38
-	conflicts = clang39
 
diff --git a/PKGBUILD b/PKGBUILD
index 59640a660729..67541dfd7144 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,8 @@
 
 pkgname=('llvm40' 'llvm40-libs' 'clang40')
 pkgver=4.0.1
-pkgrel=3
+pkgrel=4
+_prefix="/usr/lib/llvm-4.0"
 arch=('i686' 'x86_64')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
@@ -61,7 +62,7 @@ build() {
 
   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 \
@@ -90,31 +91,37 @@ check() {
 package_llvm40() {
   pkgdesc="Low Level Virtual Machine"
   depends=('llvm40-libs' 'perl')
-  conflicts=('llvm' 'llvm33' 'llvm35' 'llvm38' 'llvm39')
 
   cd "$srcdir/llvm-$pkgver.src"
 
   make -C build DESTDIR="$pkgdir" install
 
   # The runtime libraries go into llvm-libs
-  mv -f "$pkgdir"/usr/lib/lib{LLVM,LTO}*.so* "$srcdir"
-  mv -f "$pkgdir"/usr/lib/LLVMgold.so "$srcdir"
+  mv -f "${pkgdir}${_prefix}"/lib/lib{LLVM,LTO}*.so* "$srcdir"
+  mv -f "${pkgdir}${_prefix}"/lib/LLVMgold.so "$srcdir"
 
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  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%-4.0}-4.0"
+  done
 }
 
 package_llvm40-libs() {
   pkgdesc="Low Level Virtual Machine (runtime libraries)"
   depends=('gcc-libs' 'zlib' 'libffi' 'libedit' 'ncurses')
 
-  install -d "$pkgdir/usr/lib"
+  install -d "${pkgdir}${_prefix}/lib"
   cp -P \
     "$srcdir"/lib{LLVM,LTO}*.so* \
     "$srcdir"/LLVMgold.so \
-    "$pkgdir/usr/lib/"
+    "${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_clang40() {
@@ -123,7 +130,6 @@ package_clang40() {
   depends=('llvm40-libs' 'gcc' 'libxml2')
   optdepends=('openmp: OpenMP support in clang with -fopenmp'
               'python2: for scan-view and git-clang-format')
-  conflicts=('clang' 'clang35' 'clang38' 'clang39')
 
   cd "$srcdir/llvm-$pkgver.src"
 
@@ -131,7 +137,14 @@ package_clang40() {
   make -C build/projects/compiler-rt DESTDIR="$pkgdir" install
 
   install -Dm644 tools/clang/LICENSE.TXT \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    "${pkgdir}${_prefix}/share/licenses/clang/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%-4.0}-4.0"
+  done
 }
 
 # vim:set ts=2 sw=2 et: