summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD6
2 files changed, 6 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ae4cd8328340..4fc9b22d3501 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -30,6 +30,7 @@ pkgname = llvm-rc
provides = llvm
conflicts = llvm
conflicts = llvm-git
+ conflicts = llvm-stable
pkgname = llvm-libs-rc
pkgdesc = LLVM runtime libraries (rc release)
@@ -42,6 +43,7 @@ pkgname = llvm-libs-rc
provides = llvm-libs
conflicts = llvm-libs
conflicts = llvm-libs-git
+ conflicts = llvm-libs-stable
pkgname = llvm-ocaml-rc
pkgdesc = OCaml bindings for LLVM (rc release)
@@ -51,4 +53,5 @@ pkgname = llvm-ocaml-rc
provides = llvm-ocaml
conflicts = llvm-ocaml
conflicts = llvm-ocaml-git
+ conflicts = llvm-ocaml-stable
diff --git a/PKGBUILD b/PKGBUILD
index 15437171f460..fefcc21060ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -51,7 +51,7 @@ build(){
package_llvm-rc(){
pkgdesc='Collection of modular and reusable compiler and toolchain technologies (rc release)'
depends=('llvm-libs' 'perl')
- conflicts=('llvm' 'llvm-git')
+ conflicts=('llvm' 'llvm-git' 'llvm-stable')
provides=('llvm')
cd llvm-project-$pkgver.src/llvm/build
@@ -91,7 +91,7 @@ package_llvm-rc(){
package_llvm-libs-rc(){
pkgdesc='LLVM runtime libraries (rc release)'
depends=('gcc-libs' 'zlib' 'libffi' 'libedit' 'ncurses' 'libxml2')
- conflicts=('llvm-libs' 'llvm-libs-git')
+ conflicts=('llvm-libs' 'llvm-libs-git' 'llvm-libs-stable')
provides=('llvm-libs')
install -d "$pkgdir/usr/lib"
@@ -111,7 +111,7 @@ package_llvm-libs-rc(){
package_llvm-ocaml-rc(){
pkgdesc='OCaml bindings for LLVM (rc release)'
depends=('llvm' "ocaml" 'ocaml-ctypes')
- conflicts=('llvm-ocaml' 'llvm-ocaml-git')
+ conflicts=('llvm-ocaml' 'llvm-ocaml-git' 'llvm-ocaml-stable')
provides=('llvm-ocaml')
#install -d "$pkgdir"/{usr/lib,usr/share/doc/$pkgname}