summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTyler Port2017-07-10 18:07:24 -0700
committerTyler Port2017-07-10 18:07:24 -0700
commit33c033edbc7d534c8bed87e249dca088ba411470 (patch)
treeef5c7324f1b9255168447ab8959fb3d5bb543cc9
parent471a629cf3169457fa40c74102651a3d3598da9f (diff)
downloadaur-33c033edbc7d534c8bed87e249dca088ba411470.tar.gz
start switching to ninja and use pgo
-rw-r--r--.SRCINFO21
-rw-r--r--PKGBUILD48
2 files changed, 47 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 520729abd56..90ee03f24d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
# Generated by mksrcinfo v8
-# Mon Jul 10 23:17:32 UTC 2017
+# Tue Jul 11 01:06:51 UTC 2017
pkgbase = llvm-polly-svn
- pkgver = 5.0.0svn_r307598
+ pkgver = 5.0.0svn_r307605
pkgrel = 1
url = http://llvm.org/
arch = i686
arch = x86_64
license = custom:University of Illinois
makedepends = cmake
+ makedepends = ninja
makedepends = libffi
makedepends = ocaml-ctypes
makedepends = ocaml-findlib
@@ -37,7 +38,7 @@ pkgbase = llvm-polly-svn
pkgname = llvm-polly-svn
pkgdesc = The LLVM Compiler Infrastructure
groups = llvm-toolchain-polly-svn
- depends = llvm-libs-polly-svn=5.0.0svn_r307598-1
+ depends = llvm-libs-polly-svn=5.0.0svn_r307605-1
provides = llvm
conflicts = llvm,
conflicts = llvm-svn
@@ -53,7 +54,7 @@ pkgname = llvm-libs-polly-svn
pkgname = llvm-ocaml-polly-svn
pkgdesc = OCaml bindings for LLVM
- depends = llvm-polly-svn=5.0.0svn_r307598-1
+ depends = llvm-polly-svn=5.0.0svn_r307605-1
depends = ocaml=4.04.1
depends = ocaml-ctypes
provides = llvm-ocaml
@@ -63,7 +64,7 @@ pkgname = llvm-ocaml-polly-svn
pkgname = lld-polly-svn
pkgdesc = A linker from the LLVM project
groups = llvm-toolchain-polly-svn
- depends = llvm-libs-polly-svn=5.0.0svn_r307598-1
+ depends = llvm-libs-polly-svn=5.0.0svn_r307605-1
provides = lld
conflicts = lld,
conflicts = lld-svn
@@ -72,7 +73,7 @@ pkgname = lldb-polly-svn
pkgdesc = Next generation, high-performance debugger
url = http://lldb.llvm.org/
groups = llvm-toolchain-polly-svn
- depends = llvm-libs-polly-svn=5.0.0svn_r307598-1
+ depends = llvm-libs-polly-svn=5.0.0svn_r307605-1
depends = libedit
depends = libxml2
depends = python2
@@ -83,7 +84,7 @@ pkgname = clang-polly-svn
pkgdesc = C language family frontend for LLVM
url = http://clang.llvm.org/
groups = llvm-toolchain-polly-svn
- depends = llvm-polly-svn=5.0.0svn_r307598-1
+ depends = llvm-polly-svn=5.0.0svn_r307605-1
optdepends = clang-analyzer-svn: source code analysis for Clang, supporting C, C++, and Objective-C
optdepends = clang-compiler-rt-svn: sanitizer runtimes, builtins, profile library and BlocksRuntime
optdepends = clang-tools-extra-svn: standalone tools: syntax checking, formatting, refactoring, etc.
@@ -96,7 +97,7 @@ pkgname = clang-analyzer-polly-svn
pkgdesc = Source code analysis tool for Clang, supporting C, C++, and Objective-C
url = http://clang-analyzer.llvm.org/
groups = llvm-toolchain-polly-svn
- depends = clang-polly-svn=5.0.0svn_r307598-1
+ depends = clang-polly-svn=5.0.0svn_r307605-1
depends = perl
depends = python2
provides = clang-analyzer
@@ -107,7 +108,7 @@ pkgname = clang-compiler-rt-polly-svn
pkgdesc = The "compiler-rt" set of runtime libraries for Clang and LLVM
url = http://compiler-rt.llvm.org/
groups = llvm-toolchain-polly-svn
- depends = clang-polly-svn=5.0.0svn_r307598-1
+ depends = clang-polly-svn=5.0.0svn_r307605-1
provides = clang-compiler-rt
conflicts = clang-compiler-rt,
conflicts = clang-compiler-rt-svn
@@ -116,7 +117,7 @@ pkgname = clang-tools-extra-polly-svn
pkgdesc = Standalone tools for Clang: syntax checking, formatting, refactoring, etc.
url = http://clang.llvm.org/docs/ClangTools.html
groups = llvm-toolchain-polly-svn
- depends = clang-polly-svn=5.0.0svn_r307598-1
+ depends = clang-polly-svn=5.0.0svn_r307605-1
provides = clang-tools-extra
conflicts = clang-tools-extra,
conflicts = clang-tools-extra-svn
diff --git a/PKGBUILD b/PKGBUILD
index 4c81c713e93..4c1dec58148 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,7 +25,7 @@ pkgname=(
)
_pkgname='llvm'
-pkgver=5.0.0svn_r307598
+pkgver=5.0.0svn_r307605
pkgver() {
cd "$pkgname"
@@ -40,6 +40,7 @@ license=('custom:University of Illinois')
makedepends=(
'cmake'
+ 'ninja'
'libffi'
'ocaml-ctypes'
'ocaml-findlib'
@@ -125,6 +126,7 @@ _install_licenses() {
-path "${srcdir}/${_pkgname}/tools/lld" -o \
-path "${srcdir}/${_pkgname}/tools/clang" -o \
-path "${srcdir}/${_pkgname}/tools/lldb" -o \
+ -path "${srcdir}/${_pkgname}/tools/polly" -o \
-path "${srcdir}/${_pkgname}/projects/compiler-rt" \
\) -prune -o \
\( \
@@ -192,35 +194,57 @@ build() {
# LLVM_BUILD_LLVM_DYLIB: Build the dynamic runtime libraries (e.g. libLLVM.so).
# LLVM_LINK_LLVM_DYLIB: Link our own tools against the libLLVM dynamic library, too.
# LLVM_BINUTILS_INCDIR: Set to binutils' plugin-api.h location in order to build LLVMgold.
- cmake -G 'Unix Makefiles' \
+ # cmake -G 'Unix Makefiles' \
+ # -DCMAKE_BUILD_TYPE:STRING=Release \
+ # -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ # -DLLVM_APPEND_VC_REV:BOOL=ON \
+ # -DLLVM_ENABLE_RTTI:BOOL=ON \
+ # -DLLVM_ENABLE_FFI:BOOL=ON \
+ # -DFFI_INCLUDE_DIR:PATH="$(pkg-config --variable=includedir libffi)" \
+ # -DFFI_LIBRARY_DIR:PATH="$(pkg-config --variable=libdir libffi)" \
+ # -DLLVM_BUILD_DOCS:BOOL=ON \
+ # -DLLVM_ENABLE_SPHINX:BOOL=ON \
+ # -DSPHINX_OUTPUT_HTML:BOOL=ON \
+ # -DSPHINX_OUTPUT_MAN:BOOL=ON \
+ # -DSPHINX_WARNINGS_AS_ERRORS:BOOL=OFF \
+ # -DLLVM_BUILD_LLVM_DYLIB:BOOL=ON \
+ # -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
+ # -DLLVM_BINUTILS_INCDIR:PATH=/usr/include \
+ # "../${_pkgname}"
+ cmake -G Ninja \
+ -C ../clang/cmake/caches/PGO.cmake \
-DCMAKE_BUILD_TYPE:STRING=Release \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DLLVM_APPEND_VC_REV:BOOL=ON \
- -DLLVM_ENABLE_RTTI:BOOL=ON \
- -DLLVM_ENABLE_FFI:BOOL=ON \
+ -DLLVM_ENABLE_RTTI:BOOL=ON \
+ -DLLVM_ENABLE_FFI:BOOL=ON \
-DFFI_INCLUDE_DIR:PATH="$(pkg-config --variable=includedir libffi)" \
-DFFI_LIBRARY_DIR:PATH="$(pkg-config --variable=libdir libffi)" \
-DLLVM_BUILD_DOCS:BOOL=ON \
-DLLVM_ENABLE_SPHINX:BOOL=ON \
-DSPHINX_OUTPUT_HTML:BOOL=ON \
- -DSPHINX_OUTPUT_MAN:BOOL=ON \
+ -DSPHINX_OUTPUT_MAN:BOOL=ON \
-DSPHINX_WARNINGS_AS_ERRORS:BOOL=OFF \
-DLLVM_BUILD_LLVM_DYLIB:BOOL=ON \
-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
-DLLVM_BINUTILS_INCDIR:PATH=/usr/include \
"../${_pkgname}"
-
- make
- make ocaml_doc
+ ninja stage2
+ ninja ocaml_doc
+ #make
+ #make ocaml_doc
}
check() {
cd "${srcdir}/build"
# Dirty fix for unittests failing because the shared lib is not in the library path.
# Also, disable the LLVM tests on i686 as they seem to fail too often there.
- [[ "${CARCH}" == "i686" ]] || LD_LIBRARY_PATH="${srcdir}/build/lib" make check
- make check-clang
- make check-polly
+ #[[ "${CARCH}" == "i686" ]] || LD_LIBRARY_PATH="${srcdir}/build/lib" make check
+ [[ "${CARCH}" == "i686" ]] || LD_LIBRARY_PATH="${srcdir}/build/lib" ninja stage2-check
+ ninja stage2-check-clang
+ #ninja stage2-check-polly
+ #make check-clang
+ #make check-polly
}
package_llvm-polly-svn() {