summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLW-archlinux2019-04-28 14:44:06 +0200
committerLW-archlinux2019-04-28 14:44:06 +0200
commitf630e5a69ece5ceb759015d9753837ff00404cbe (patch)
tree735104c353e5067c52668507003e87718a8c783b
parente17ace6b4f55886507e73299efff83aa38f5d172 (diff)
downloadaur-f630e5a69ece5ceb759015d9753837ff00404cbe.tar.gz
removed provides for stable llvm/clang parts to avoid problems
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD9
2 files changed, 6 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 34dd0ca074a3..5bfa8ea2a148 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = llvm-git
- pkgver = 9.0.0_r315154.43003f0fec7
+ pkgver = 9.0.0_r315155.fb9a5307a94
pkgrel = 1
url = https://llvm.org/
arch = x86_64
@@ -33,13 +33,6 @@ pkgname = llvm-git
optdepends = python: for scripts
optdepends = python-setuptools: for using lit (LLVM Integrated Tester)
optdepends = ocaml: for ocaml support
- provides = llvm
- provides = compiler-rt
- provides = clang
- provides = lld
- provides = lldb
- provides = polly
- provides = llvm-ocaml
provides = compiler-rt-git
provides = clang-git
provides = lld-git
@@ -60,6 +53,7 @@ pkgname = llvm-git
conflicts = lldb
conflicts = polly
conflicts = llvm-ocaml
+ conflicts = llvm-lw-git
pkgname = llvm-libs-git
pkgdesc = runtime libraries for llvm-git
@@ -69,7 +63,6 @@ pkgname = llvm-libs-git
depends = libedit
depends = ncurses
depends = libxml2
- provides = llvm-libs
provides = llvm-libs-svn
conflicts = llvm-libs
diff --git a/PKGBUILD b/PKGBUILD
index 794385520088..ba3212a2977e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@
pkgname=('llvm-git' 'llvm-libs-git')
-pkgver=9.0.0_r315154.43003f0fec7
+pkgver=9.0.0_r315155.fb9a5307a94
pkgrel=1
_ocaml_ver=4.07.1
arch=('x86_64')
@@ -124,12 +124,11 @@ package_llvm-git() {
'python-setuptools: for using lit (LLVM Integrated Tester)'
'ocaml: for ocaml support')
# yes, I know polly is not in official repos. It just feels cleaner to list it
- provides=('llvm' 'compiler-rt' 'clang' 'lld' 'lldb' 'polly' 'llvm-ocaml'
- 'compiler-rt-git' 'clang-git' 'lld-git' 'lldb-git' 'polly-git' 'llvm-ocaml-git'
+ provides=('compiler-rt-git' 'clang-git' 'lld-git' 'lldb-git' 'polly-git' 'llvm-ocaml-git'
# legacy provides
'llvm-svn' 'compiler-rt-svn' 'clang-svn' 'lld-svn' 'lldb-svn' 'polly-svn' 'llvm-ocaml-svn'
)
- conflicts=('llvm' 'compiler-rt' 'clang' 'lld' 'lldb' 'polly' 'llvm-ocaml')
+ conflicts=('llvm' 'compiler-rt' 'clang' 'lld' 'lldb' 'polly' 'llvm-ocaml' 'llvm-lw-git')
pushd _build
@@ -182,7 +181,7 @@ package_llvm-git() {
package_llvm-libs-git() {
pkgdesc="runtime libraries for llvm-git"
depends=('gcc-libs' 'zlib' 'libffi' 'libedit' 'ncurses' 'libxml2')
- provides=('llvm-libs' 'llvm-libs-svn')
+ provides=('llvm-libs-svn')
conflicts=('llvm-libs')
install -d "$pkgdir"/usr/lib