summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLW-archlinux2019-11-13 16:08:31 +0100
committerLW-archlinux2019-11-13 16:08:31 +0100
commitc4d49c5326f4c7d173bdb4357079cc015bc8c9bb (patch)
tree50b9cd3f7d24cc184832f4c9c9d042fa4fb27787
parent8c4f7faae622ff9fc38f412a01539d83b1f6e39b (diff)
downloadaur-c4d49c5326f4c7d173bdb4357079cc015bc8c9bb.tar.gz
llvm-ocaml-git related corrections
-rw-r--r--.SRCINFO32
-rw-r--r--PKGBUILD31
2 files changed, 31 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4f50482ff7f..184358caab5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = llvm-git
- pkgver = 10.0.0_r331726.33e882d5ada
+ pkgver = 10.0.0_r331734.86f07e826f4
pkgrel = 1
url = https://llvm.org/
arch = x86_64
@@ -32,24 +32,22 @@ pkgbase = llvm-git
pkgname = llvm-git
pkgdesc = LLVM development version. includes clang and many other tools
- depends = llvm-libs-git=10.0.0_r331726.33e882d5ada-1
+ depends = llvm-libs-git=10.0.0_r331734.86f07e826f4-1
depends = perl
+ depends = ocaml=4.09.0
optdepends = python: for scripts
- optdepends = python-setuptools: for using lit (LLVM Integrated Tester)
- optdepends = ocaml: for ocaml support
+ optdepends = python-setuptools: for using lit = LLVM Integrated Tester
provides = aur-llvm-git
- provides = compiler-rt-git=10.0.0_r331726.33e882d5ada-1
- provides = clang-git=10.0.0_r331726.33e882d5ada-1
- provides = lld-git=10.0.0_r331726.33e882d5ada-1
- provides = lldb-git=10.0.0_r331726.33e882d5ada-1
- provides = polly-git=10.0.0_r331726.33e882d5ada-1
- provides = llvm-ocaml-git=10.0.0_r331726.33e882d5ada-1
- provides = compiler-rt=10.0.0_r331726.33e882d5ada-1
- provides = clang=10.0.0_r331726.33e882d5ada-1
- provides = lld=10.0.0_r331726.33e882d5ada-1
- provides = lldb=10.0.0_r331726.33e882d5ada-1
- provides = polly=10.0.0_r331726.33e882d5ada-1
- provides = llvm-ocaml=10.0.0_r331726.33e882d5ada-1
+ provides = compiler-rt-git=10.0.0_r331734.86f07e826f4-1
+ provides = clang-git=10.0.0_r331734.86f07e826f4-1
+ provides = lld-git=10.0.0_r331734.86f07e826f4-1
+ provides = lldb-git=10.0.0_r331734.86f07e826f4-1
+ provides = polly-git=10.0.0_r331734.86f07e826f4-1
+ provides = compiler-rt=10.0.0_r331734.86f07e826f4-1
+ provides = clang=10.0.0_r331734.86f07e826f4-1
+ provides = lld=10.0.0_r331734.86f07e826f4-1
+ provides = lldb=10.0.0_r331734.86f07e826f4-1
+ provides = polly=10.0.0_r331734.86f07e826f4-1
conflicts = llvm
conflicts = compiler-rt
conflicts = clang
@@ -67,6 +65,6 @@ pkgname = llvm-libs-git
depends = ncurses
depends = libxml2
provides = aur-llvm-libs-git
- provides = llvm-libs=10.0.0_r331726.33e882d5ada-1
+ provides = llvm-libs=10.0.0_r331734.86f07e826f4-1
conflicts = llvm-libs
diff --git a/PKGBUILD b/PKGBUILD
index a37dc997500..9b1865cf2f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@
pkgname=('llvm-git' 'llvm-libs-git')
-pkgver=10.0.0_r331726.33e882d5ada
+pkgver=10.0.0_r331734.86f07e826f4
pkgrel=1
arch=('x86_64')
url="https://llvm.org/"
@@ -45,7 +45,7 @@ _python_optimize() {
python -OO -m compileall "$@"
}
- _ocaml_ver() {
+ _ocamlver() {
{ pacman -Q ocaml 2>/dev/null || pacman -Sp --print-format '%n %v' ocaml ;} \
| awk '{ print $2 }' | cut -d - -f 1 | cut -d . -f 1,2,3
}
@@ -124,14 +124,14 @@ check() {
package_llvm-git() {
pkgdesc="LLVM development version. includes clang and many other tools"
- depends=(llvm-libs-git=$pkgver-$pkgrel 'perl')
- optdepends=( 'python: for scripts'
- 'python-setuptools: for using lit (LLVM Integrated Tester)'
- 'ocaml: for ocaml support')
+ depends=("llvm-libs-git=$pkgver-$pkgrel" 'perl' "ocaml=$(_ocamlver)")
+ optdepends=('python: for scripts'
+ 'python-setuptools: for using lit = LLVM Integrated Tester'
+ )
# yes, I know polly is not in official repos. It just feels cleaner to list it
provides=(aur-llvm-git
- compiler-rt-git=$pkgver-$pkgrel clang-git=$pkgver-$pkgrel lld-git=$pkgver-$pkgrel lldb-git=$pkgver-$pkgrel polly-git=$pkgver-$pkgrel llvm-ocaml-git=$pkgver-$pkgrel
- compiler-rt=$pkgver-$pkgrel clang=$pkgver-$pkgrel lld=$pkgver-$pkgrel lldb=$pkgver-$pkgrel polly=$pkgver-$pkgrel llvm-ocaml=$pkgver-$pkgrel
+ compiler-rt-git=$pkgver-$pkgrel clang-git=$pkgver-$pkgrel lld-git=$pkgver-$pkgrel lldb-git=$pkgver-$pkgrel polly-git=$pkgver-$pkgrel
+ compiler-rt=$pkgver-$pkgrel clang=$pkgver-$pkgrel lld=$pkgver-$pkgrel lldb=$pkgver-$pkgrel polly=$pkgver-$pkgrel
)
# A package always provides itself, so there's no need to provide llvm-git
conflicts=('llvm' 'compiler-rt' 'clang' 'lld' 'lldb' 'polly' 'llvm-ocaml')
@@ -217,12 +217,13 @@ package_llvm-libs-git() {
}
package_llvm-ocaml-git() {
- pkgdesc="OCaml bindings for LLVM"
- depends=('llvm-git' "ocaml=$(_ocaml_ver)" 'ocaml-ctypes')
-
- install -d "$pkgdir"/{usr/lib,usr/share/doc/$pkgname}
- cp -a "$srcdir"/ocaml.lib "$pkgdir"/usr/lib/ocaml
- cp -a "$srcdir"/ocaml.doc "$pkgdir"/usr/share/doc/$pkgname/html
+ pkgdesc="OCaml bindings for LLVM"
+ depends=("llvm-git=$pkgver-$pkgrel" "ocaml=$(_ocaml_ver)" 'ocaml-ctypes')
+ provides=("llvm-ocaml=$pkgver-$pkgrel")
+
+ install -d "$pkgdir"/{usr/lib,usr/share/doc/$pkgname}
+ cp -a "$srcdir"/ocaml.lib "$pkgdir"/usr/lib/ocaml
+ cp -a "$srcdir"/ocaml.doc "$pkgdir"/usr/share/doc/$pkgname/html
- install -Dm644 "$srcdir"/llvm-$pkgver.src/LICENSE.TXT "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+ install -Dm644 "$srcdir"/llvm-$pkgver.src/LICENSE.TXT "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}