diff options
author | LW-archlinux | 2019-05-27 16:46:22 +0200 |
---|---|---|
committer | LW-archlinux | 2019-05-27 16:46:22 +0200 |
commit | 9559cd520b9069414b907c32ea1f2fe3c7df50d7 (patch) | |
tree | a624e06f1c69c23b6f2b40445a025c164fbe7c02 | |
parent | 4f2ecf85d5da60c73e5022dd1312b00611786771 (diff) | |
download | aur-9559cd520b9069414b907c32ea1f2fe3c7df50d7.tar.gz |
users should validate NINJAFLAGS value, not PKGBUILD
-rw-r--r-- | .SRCINFO | 32 | ||||
-rw-r--r-- | PKGBUILD | 30 |
2 files changed, 24 insertions, 38 deletions
@@ -1,5 +1,5 @@ pkgbase = llvm-git - pkgver = 9.0.0_r317457.5a500fd2c50 + pkgver = 9.0.0_r317463.bcc0cedf770 pkgrel = 1 url = https://llvm.org/ arch = x86_64 @@ -28,23 +28,23 @@ pkgbase = llvm-git pkgname = llvm-git pkgdesc = LLVM development version. includes clang and many other tools - depends = llvm-libs-git=9.0.0_r317457.5a500fd2c50-1 + depends = llvm-libs-git=9.0.0_r317463.bcc0cedf770-1 depends = perl optdepends = python: for scripts optdepends = python-setuptools: for using lit (LLVM Integrated Tester) optdepends = ocaml: for ocaml support - provides = compiler-rt-git=9.0.0_r317457.5a500fd2c50-1 - provides = clang-git=9.0.0_r317457.5a500fd2c50-1 - provides = lld-git=9.0.0_r317457.5a500fd2c50-1 - provides = lldb-git=9.0.0_r317457.5a500fd2c50-1 - provides = polly-git=9.0.0_r317457.5a500fd2c50-1 - provides = llvm-ocaml-git=9.0.0_r317457.5a500fd2c50-1 - provides = compiler-rt=9.0.0_r317457.5a500fd2c50-1 - provides = clang=9.0.0_r317457.5a500fd2c50-1 - provides = lld=9.0.0_r317457.5a500fd2c50-1 - provides = lldb=9.0.0_r317457.5a500fd2c50-1 - provides = polly=9.0.0_r317457.5a500fd2c50-1 - provides = llvm-ocaml=9.0.0_r317457.5a500fd2c50-1 + provides = compiler-rt-git=9.0.0_r317463.bcc0cedf770-1 + provides = clang-git=9.0.0_r317463.bcc0cedf770-1 + provides = lld-git=9.0.0_r317463.bcc0cedf770-1 + provides = lldb-git=9.0.0_r317463.bcc0cedf770-1 + provides = polly-git=9.0.0_r317463.bcc0cedf770-1 + provides = llvm-ocaml-git=9.0.0_r317463.bcc0cedf770-1 + provides = compiler-rt=9.0.0_r317463.bcc0cedf770-1 + provides = clang=9.0.0_r317463.bcc0cedf770-1 + provides = lld=9.0.0_r317463.bcc0cedf770-1 + provides = lldb=9.0.0_r317463.bcc0cedf770-1 + provides = polly=9.0.0_r317463.bcc0cedf770-1 + provides = llvm-ocaml=9.0.0_r317463.bcc0cedf770-1 provides = llvm-svn provides = compiler-rt-svn provides = clang-svn @@ -69,7 +69,7 @@ pkgname = llvm-libs-git depends = libedit depends = ncurses depends = libxml2 - provides = llvm-libs=9.0.0_r317457.5a500fd2c50-1 - provides = llvm-libs-svn=9.0.0_r317457.5a500fd2c50-1 + provides = llvm-libs=9.0.0_r317463.bcc0cedf770-1 + provides = llvm-libs-svn=9.0.0_r317463.bcc0cedf770-1 conflicts = llvm-libs @@ -15,7 +15,7 @@ pkgname=('llvm-git' 'llvm-libs-git') -pkgver=9.0.0_r317457.5a500fd2c50 +pkgver=9.0.0_r317463.bcc0cedf770 pkgrel=1 _ocaml_ver=4.07.1 arch=('x86_64') @@ -32,6 +32,9 @@ sha256sums=('SKIP' '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48' '58f86da25eb230ed6d423b5b61870cbf3bef88f38103ca676a2c7f34b2372171') +# NINJAFLAGS is an env var used to pass commandline options to ninja +# NOTE: It's your responbility to validate the value of $NINJAFLAGS. If unsure, don't set it. + _python_optimize() { python -m compileall "$@" python -O -m compileall "$@" @@ -100,23 +103,13 @@ build() { -DPOLLY_ENABLE_GPGPU_CODEGEN=ON \ -DLINK_POLLY_INTO_TOOLS=ON \ -DCMAKE_POLICY_DEFAULT_CMP0075=NEW - if [[ ! $NINJAFLAGS ]]; then - ninja all ocaml_doc - else - ninja "$NINJAFLAGS" all ocaml_doc - fi + + ninja "$NINJAFLAGS" all ocaml_doc } check() { cd _build - if [[ ! $NINJAFLAGS ]]; then - ninja check check-polly check-lld check-lldb check-clang - else ninja "$NINJAFLAGS" check check-polly check-lld check-lldb check-clang - fi - - - } package_llvm-git() { @@ -133,24 +126,17 @@ package_llvm-git() { conflicts=('llvm' 'compiler-rt' 'clang' 'lld' 'lldb' 'polly' 'llvm-ocaml' 'llvm-lw-git') pushd _build - - if [[ ! $NINJAFLAGS ]]; then - DESTDIR="$pkgdir" ninja install - else DESTDIR="$pkgdir" ninja "$NINJAFLAGS" install - fi - - - popd + # Clean up conflicting files # TODO: This should probably be discussed with upstream. rm -rf "${pkgdir}/usr/lib/python3.7/site-packages/six.py" + # Include lit for running lit-based tests in other projects pushd llvm-project/llvm/utils/lit python setup.py install --root="$pkgdir" -O1 popd - # Move analyzer scripts out of /usr/libexec mv "$pkgdir"/usr/libexec/{ccc,c++}-analyzer "$pkgdir"/usr/lib/clang/ |