summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLone_Wolf2020-06-08 13:49:31 +0200
committerLone_Wolf2020-06-08 13:49:31 +0200
commit03d39767fafb7fcab107e9855b6f25b2652186ef (patch)
treea35d452c321faff55cc71faaab6d334934f33e29
parentb4ba806d0b61e36d4c057eb307756fea3c924ee1 (diff)
downloadaur-03d39767fafb7fcab107e9855b6f25b2652186ef.tar.gz
changed check() function so it does not build all tests, also adjusted PKGBUILD for changes in archlinux cmake packaging, see https://wiki.archlinux.org/index.php/CMake_package_guidelines
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD35
2 files changed, 16 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c6d811095fde..ebe0b5503e5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = llvm-minimal-git
- pkgver = 11.0.0_r353030.54d7db165d4
+ pkgver = 11.0.0_r356572.3ebbe353638
pkgrel = 1
url = https://llvm.org/
arch = x86_64
@@ -24,7 +24,7 @@ pkgbase = llvm-minimal-git
pkgname = llvm-minimal-git
pkgdesc = Collection of modular and reusable compiler and toolchain technologies
- depends = llvm-libs-minimal-git=11.0.0_r353030.54d7db165d4-1
+ depends = llvm-libs-minimal-git=11.0.0_r356572.3ebbe353638-1
depends = perl
optdepends = python-setuptools: for using lit (LLVM Integrated Tester)
provides = llvm
diff --git a/PKGBUILD b/PKGBUILD
index 7d858cdb62a1..d52c3c3bcd51 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@
pkgbase=llvm-minimal-git
pkgname=('llvm-minimal-git' 'llvm-libs-minimal-git')
-pkgver=11.0.0_r353030.54d7db165d4
+pkgver=11.0.0_r356572.3ebbe353638
pkgrel=1
arch=('x86_64')
url="https://llvm.org/"
@@ -49,11 +49,6 @@ pkgver() {
}
prepare() {
- if [ -d _build ]; then
- rm -rf _build
- fi
- mkdir _build
-
cd llvm-project
# remove code parts not needed for build
rm -rf debuginfo-tests libclc libcxx libcxxabi libunwind lld lldb llgo openmp parallel-libs polly pstl mlir libc flang
@@ -61,11 +56,12 @@ prepare() {
build() {
- cd _build
-
- cmake "$srcdir"/llvm-project/llvm -G Ninja \
- -D CMAKE_C_FLAGS="${CFLAGS}" \
- -D CMAKE_CXX_FLAGS="${CXXFLAGS}" \
+ export CFLAGS+=" ${CPPFLAGS}"
+ export CXXFLAGS+=" ${CPPFLAGS}"
+ cmake \
+ -B _build \
+ -S "$srcdir"/llvm-project/llvm \
+ -G Ninja \
-D CMAKE_BUILD_TYPE=Release \
-D CMAKE_INSTALL_PREFIX=/usr \
-D LLVM_BINUTILS_INCDIR=/usr/include \
@@ -85,18 +81,16 @@ build() {
-D SPHINX_WARNINGS_AS_ERRORS=OFF \
-D LLVM_ENABLE_DOXYGEN=OFF \
-D LLVM_ENABLE_BINDINGS=OFF \
- -D LLVM_ENABLE_PROJECTS="compiler-rt;clang-tools-extra;clang"
+ -D LLVM_ENABLE_PROJECTS="compiler-rt;clang-tools-extra;clang" \
+ -Wno-dev
- ninja $NINJAFLAGS
-
+ ninja -C _build $NINJAFLAGS
}
check() {
- cd _build
- ninja $NINJAFLAGS check
- ninja $NINJAFLAGS check-clang
- ninja $NINJAFLAGS check-clang-tools
-
+ ninja -C _build $NINJAFLAGS check-llvm
+ ninja -C _build $NINJAFLAGS check-clang
+ ninja -C _build $NINJAFLAGS check-clang-tools
}
package_llvm-minimal-git() {
@@ -106,8 +100,7 @@ package_llvm-minimal-git() {
conflicts=('llvm' 'compiler-rt' 'clang')
optdepends=('python-setuptools: for using lit (LLVM Integrated Tester)')
- cd _build
- DESTDIR="$pkgdir" ninja $NINJAFLAGS install
+ DESTDIR="$pkgdir" ninja -C _build $NINJAFLAGS install
# Include lit for running lit-based tests in other projects
pushd "$srcdir"/llvm-project/llvm/utils/lit