summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLone_Wolf2020-10-23 15:12:37 +0200
committerLone_Wolf2020-10-23 15:12:37 +0200
commite89cd2faa080433da2560f3a5a5d06c2b5c2c999 (patch)
treeca875e2ffde396b747610b4d7330b99452cc7180
parent98f33344a3367a03ac08c9d6c30a1b6cc8a0a973 (diff)
downloadaur-e89cd2faa080433da2560f3a5a5d06c2b5c2c999.tar.gz
no longer building lld
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD24
2 files changed, 12 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ab9457535a5..4ec893ae2f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = llvm-git
- pkgver = 12.0.0_r362797.100e1f911c0e
+ pkgver = 12.0.0_r369828.e6c4d880fa8c
pkgrel = 1
url = https://llvm.org/
arch = x86_64
@@ -35,25 +35,22 @@ pkgbase = llvm-git
pkgname = llvm-git
pkgdesc = LLVM development version. includes clang and many other tools
- depends = llvm-libs-git=12.0.0_r362797.100e1f911c0e-1
+ depends = llvm-libs-git=12.0.0_r369828.e6c4d880fa8c-1
depends = perl
optdepends = python: for scripts
optdepends = python-setuptools: for using lit = LLVM Integrated Tester
provides = aur-llvm-git
provides = compiler-rt-git
provides = clang-git
- provides = lld-git
provides = lldb-git
provides = polly-git
provides = compiler-rt
provides = clang
- provides = lld
provides = lldb
provides = polly
conflicts = llvm
conflicts = compiler-rt
conflicts = clang
- conflicts = lld
conflicts = lldb
conflicts = polly
@@ -67,13 +64,13 @@ pkgname = llvm-libs-git
depends = libxml2
depends = z3
depends = lua
+ optdepends = llvm-libs: for LLVMgold linker
provides = aur-llvm-libs-git
provides = llvm-libs
- conflicts = llvm-libs
pkgname = llvm-ocaml-git
pkgdesc = OCaml bindings for LLVM
- depends = llvm-git=12.0.0_r362797.100e1f911c0e-1
+ depends = llvm-git=12.0.0_r369828.e6c4d880fa8c-1
depends = ocaml
depends = ocaml-ctypes
provides = llvm-ocaml
diff --git a/PKGBUILD b/PKGBUILD
index 996d19c5fa7..06a0d0243fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@
pkgname=('llvm-git' 'llvm-libs-git' 'llvm-ocaml-git')
-pkgver=12.0.0_r362797.100e1f911c0e
+pkgver=12.0.0_r369828.e6c4d880fa8c
pkgrel=1
arch=('x86_64')
url="https://llvm.org/"
@@ -59,7 +59,7 @@ pkgver() {
prepare() {
cd llvm-project
# llvm-project contains a lot of stuff, remove parts that aren't used by this package
- rm -rf debuginfo-tests libclc libcxx libcxxabi libunwind llgo openmp parallel-libs pstl libc mlir flang
+ rm -rf debuginfo-tests libclc libcxx libcxxabi libunwind llgo openmp parallel-libs pstl libc mlir flang lld
}
@@ -91,7 +91,7 @@ build() {
-D SPHINX_WARNINGS_AS_ERRORS=OFF \
-D POLLY_ENABLE_GPGPU_CODEGEN=ON \
-D LLDB_USE_SYSTEM_SIX=1 \
- -D LLVM_ENABLE_PROJECTS="polly;lldb;lld;compiler-rt;clang-tools-extra;clang"
+ -D LLVM_ENABLE_PROJECTS="polly;lldb;compiler-rt;clang-tools-extra;clang"
ninja -C _build $NINJAFLAGS
ninja -C _build $NINJAFLAGS ocaml_doc
@@ -103,7 +103,6 @@ check() {
ninja -C _build $NINJAFLAGS check-clang
ninja -C _build $NINJAFLAGS check-clang-tools
ninja -C _build $NINJAFLAGS check-polly
- ninja -C _build $NINJAFLAGS check-lld
ninja -C _build $NINJAFLAGS check-lldb
}
@@ -115,11 +114,11 @@ package_llvm-git() {
)
# yes, I know polly is not in official repos. It just feels cleaner to list it
provides=(aur-llvm-git
- compiler-rt-git clang-git lld-git lldb-git polly-git
- compiler-rt clang lld lldb polly
+ compiler-rt-git clang-git lldb-git polly-git
+ compiler-rt clang lldb polly
)
# A package always provides itself, so there's no need to provide llvm-git
- conflicts=('llvm' 'compiler-rt' 'clang' 'lld' 'lldb' 'polly')
+ conflicts=('llvm' 'compiler-rt' 'clang' 'lldb' 'polly')
DESTDIR="$pkgdir" ninja -C _build $NINJAFLAGS install
@@ -165,7 +164,6 @@ package_llvm-git() {
install -Dm644 clang/LICENSE.TXT "$pkgdir"/usr/share/licenses/$pkgname/clang-LICENSE
install -Dm644 clang-tools-extra/LICENSE.TXT "$pkgdir"/usr/share/licenses/$pkgname/clang-tools-extra-LICENSE
install -Dm644 compiler-rt/LICENSE.TXT "$pkgdir"/usr/share/licenses/$pkgname/compiler-rt-LICENSE
- install -Dm644 lld/LICENSE.TXT "$pkgdir"/usr/share/licenses/$pkgname/lld-LICENSE
install -Dm644 lldb/LICENSE.TXT "$pkgdir"/usr/share/licenses/$pkgname/lldb-LICENSE
install -Dm644 polly/LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/polly-LICENSE
}
@@ -174,25 +172,19 @@ package_llvm-libs-git() {
pkgdesc="runtime libraries for llvm-git"
depends=('gcc-libs' 'zlib' 'libffi' 'libedit' 'ncurses' 'libxml2' 'z3' 'lua')
provides=(aur-llvm-libs-git llvm-libs)
- conflicts=('llvm-libs')
+ optdepends=('llvm-libs: for LLVMgold linker')
+
install -d "$pkgdir"/usr/lib
cp -P \
"$srcdir"/lib{LLVM,LTO,Remarks}*.so* \
- "$srcdir"/LLVMgold.so \
"$pkgdir"/usr/lib/
- # Symlink LLVMgold.so from /usr/lib/bfd-plugins
- # https://bugs.archlinux.org/task/28479
- install -d "$pkgdir"/usr/lib/bfd-plugins
- ln -s ../LLVMgold.so "$pkgdir"/usr/lib/bfd-plugins/LLVMgold.so
-
cd llvm-project/
install -Dm644 llvm/LICENSE.TXT "$pkgdir"/usr/share/licenses/$pkgname/llvm-LICENSE
install -Dm644 clang/LICENSE.TXT "$pkgdir"/usr/share/licenses/$pkgname/clang-LICENSE
install -Dm644 clang-tools-extra/LICENSE.TXT "$pkgdir"/usr/share/licenses/$pkgname/clang-tools-extra-LICENSE
install -Dm644 compiler-rt/LICENSE.TXT "$pkgdir"/usr/share/licenses/$pkgname/compiler-rt-LICENSE
- install -Dm644 lld/LICENSE.TXT "$pkgdir"/usr/share/licenses/$pkgname/lld-LICENSE
install -Dm644 lldb/LICENSE.TXT "$pkgdir"/usr/share/licenses/$pkgname/lldb-LICENSE
install -Dm644 polly/LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/polly-LICENSE
}