summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD17
2 files changed, 27 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1096071824db..701da1c7022a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = llvm-git
- pkgver = 9.0.0_r314159.065480daf2e
+ pkgver = 9.0.0_r314160.12886f04eae
pkgrel = 1
url = https://llvm.org/
arch = x86_64
@@ -19,7 +19,6 @@ pkgbase = llvm-git
makedepends = python-recommonmark
makedepends = swig
makedepends = python
- options = staticlibs
source = llvm-project::git+https://github.com/llvm/llvm-project.git
source = llvm-config.h
source = enable-SSP-and-PIE-by-default.patch
@@ -41,6 +40,19 @@ pkgname = llvm-git
provides = lldb
provides = polly
provides = llvm-ocaml
+ provides = compiler-rt-git
+ provides = clang-git
+ provides = lld-git
+ provides = lldb-git
+ provides = polly-git
+ provides = llvm-ocaml-git
+ provides = llvm-svn
+ provides = compiler-rt-svn
+ provides = clang-svn
+ provides = lld-svn
+ provides = lldb-svn
+ provides = polly-svn
+ provides = llvm-ocaml-svn
conflicts = llvm
conflicts = compiler-rt
conflicts = clang
@@ -58,4 +70,6 @@ pkgname = llvm-libs-git
depends = ncurses
depends = libxml2
provides = llvm-libs
+ provides = llvm-libs-svn
+ conflicts = llvm-libs
diff --git a/PKGBUILD b/PKGBUILD
index 03c686bb53c3..02ead19f7748 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@
pkgname=('llvm-git' 'llvm-libs-git')
-pkgver=9.0.0_r314159.065480daf2e
+pkgver=9.0.0_r314160.12886f04eae
pkgrel=1
_ocaml_ver=4.07.1
arch=('x86_64')
@@ -25,7 +25,6 @@ makedepends=( 'git' 'cmake' 'ninja' 'libffi' 'libedit' 'ncurses' 'libxml2' 'py
"ocaml=$_ocaml_ver" 'ocaml-ctypes' 'ocaml-findlib'
'python-sphinx' 'python-recommonmark' 'swig' 'python')
-options=('staticlibs')
source=("llvm-project::git+https://github.com/llvm/llvm-project.git"
'llvm-config.h'
'enable-SSP-and-PIE-by-default.patch')
@@ -98,7 +97,8 @@ build() {
-DLLVM_BINUTILS_INCDIR=/usr/include \
-DLLVM_VERSION_SUFFIX="" \
-DPOLLY_ENABLE_GPGPU_CODEGEN=ON \
- -DLINK_POLLY_INTO_TOOLS=ON
+ -DLINK_POLLY_INTO_TOOLS=ON \
+ -DCMAKE_POLICY_DEFAULT_CMP0075=NEW
ninja "$MAKEFLAGS" all ocaml_doc
}
@@ -119,8 +119,12 @@ package_llvm-git() {
optdepends=( 'python: for scripts'
'python-setuptools: for using lit (LLVM Integrated Tester)'
'ocaml: for ocaml support')
- # yes, I know polly is not in official repos
- provides=('llvm' 'compiler-rt' 'clang' 'lld' 'lldb' 'polly' 'llvm-ocaml')
+ # 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'
+ # 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')
pushd _build
@@ -174,7 +178,8 @@ package_llvm-git() {
package_llvm-libs-git() {
pkgdesc="runtime libraries for llvm-git"
depends=('gcc-libs' 'zlib' 'libffi' 'libedit' 'ncurses' 'libxml2')
- provides=('llvm-libs')
+ provides=('llvm-libs' 'llvm-libs-svn')
+ conflicts=('llvm-libs')
install -d "$pkgdir"/usr/lib
cp -P \