summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLW-archlinux2019-11-18 15:12:57 +0100
committerLW-archlinux2019-11-18 15:12:57 +0100
commita0f96280a362d6c0c8212bb42097694b1d4b17dd (patch)
treed5b31e05fad02062fb87abfcee0a526d6ef7c736
parentbcee49b510a96b886ee6ea184ee90805ed3bd312 (diff)
downloadaur-a0f96280a362d6c0c8212bb42097694b1d4b17dd.tar.gz
minor corrections related to python 3.8 and incorrect copy-pasting
-rw-r--r--.SRCINFO30
-rw-r--r--PKGBUILD13
2 files changed, 22 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ee5b0059872..7bdbee9e46c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = llvm-git
- pkgver = 10.0.0_r332048.eedb9648229
+ pkgver = 10.0.0_r332063.b462cdff05b
pkgrel = 1
url = https://llvm.org/
arch = x86_64
@@ -32,21 +32,21 @@ pkgbase = llvm-git
pkgname = llvm-git
pkgdesc = LLVM development version. includes clang and many other tools
- depends = llvm-libs-git=10.0.0_r332048.eedb9648229-1
+ depends = llvm-libs-git=10.0.0_r332063.b462cdff05b-1
depends = perl
optdepends = python: for scripts
optdepends = python-setuptools: for using lit = LLVM Integrated Tester
provides = aur-llvm-git
- provides = compiler-rt-git=10.0.0_r332048.eedb9648229-1
- provides = clang-git=10.0.0_r332048.eedb9648229-1
- provides = lld-git=10.0.0_r332048.eedb9648229-1
- provides = lldb-git=10.0.0_r332048.eedb9648229-1
- provides = polly-git=10.0.0_r332048.eedb9648229-1
- provides = compiler-rt=10.0.0_r332048.eedb9648229-1
- provides = clang=10.0.0_r332048.eedb9648229-1
- provides = lld=10.0.0_r332048.eedb9648229-1
- provides = lldb=10.0.0_r332048.eedb9648229-1
- provides = polly=10.0.0_r332048.eedb9648229-1
+ provides = compiler-rt-git=10.0.0_r332063.b462cdff05b-1
+ provides = clang-git=10.0.0_r332063.b462cdff05b-1
+ provides = lld-git=10.0.0_r332063.b462cdff05b-1
+ provides = lldb-git=10.0.0_r332063.b462cdff05b-1
+ provides = polly-git=10.0.0_r332063.b462cdff05b-1
+ provides = compiler-rt=10.0.0_r332063.b462cdff05b-1
+ provides = clang=10.0.0_r332063.b462cdff05b-1
+ provides = lld=10.0.0_r332063.b462cdff05b-1
+ provides = lldb=10.0.0_r332063.b462cdff05b-1
+ provides = polly=10.0.0_r332063.b462cdff05b-1
conflicts = llvm
conflicts = compiler-rt
conflicts = clang
@@ -63,14 +63,14 @@ pkgname = llvm-libs-git
depends = ncurses
depends = libxml2
provides = aur-llvm-libs-git
- provides = llvm-libs=10.0.0_r332048.eedb9648229-1
+ provides = llvm-libs=10.0.0_r332063.b462cdff05b-1
conflicts = llvm-libs
pkgname = llvm-ocaml-git
pkgdesc = OCaml bindings for LLVM
- depends = llvm-git=10.0.0_r332048.eedb9648229-1
+ depends = llvm-git=10.0.0_r332063.b462cdff05b-1
depends = ocaml=4.09.0
depends = ocaml-ctypes
- provides = llvm-ocaml=10.0.0_r332048.eedb9648229-1
+ provides = llvm-ocaml=10.0.0_r332063.b462cdff05b-1
conflicts = llvm-ocaml
diff --git a/PKGBUILD b/PKGBUILD
index ae3d939b7a5..29366875bda 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@
pkgname=('llvm-git' 'llvm-libs-git' 'llvm-ocaml-git')
-pkgver=10.0.0_r332048.eedb9648229
+pkgver=10.0.0_r332063.b462cdff05b
pkgrel=1
arch=('x86_64')
url="https://llvm.org/"
@@ -140,9 +140,10 @@ package_llvm-git() {
DESTDIR="$pkgdir" ninja $NINJAFLAGS install
popd
+ _py="3.8"
# Clean up conflicting files
# TODO: This should probably be discussed with upstream.
- rm -rf "${pkgdir}/usr/lib/python3.7/site-packages/six.py"
+ rm -rf "${pkgdir}/usr/lib/python$_py/site-packages/six.py"
# Include lit for running lit-based tests in other projects
pushd llvm-project/llvm/utils/lit
@@ -173,9 +174,9 @@ package_llvm-git() {
cd llvm-project
# Install Python bindings and optimize them
- cp -a llvm/bindings/python/llvm "$pkgdir"/usr/lib/python3.7/site-packages/
- cp -a clang/bindings/python/clang "$pkgdir"/usr/lib/python3.7/site-packages/
- _python_optimize "$pkgdir"/usr/lib/python3.7/site-packages
+ cp -a llvm/bindings/python/llvm "$pkgdir"/usr/lib/python$_py/site-packages/
+ cp -a clang/bindings/python/clang "$pkgdir"/usr/lib/python$_py/site-packages/
+ _python_optimize "$pkgdir"/usr/lib/python$_py/site-packages
#optimize other python files except 2 problem cases
_python_optimize "$pkgdir"/usr/share -x 'clang-include-fixer|run-find-all-symbols'
@@ -226,5 +227,5 @@ package_llvm-ocaml-git() {
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-project/llvm/LICENSE.TXT "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}