summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTyler Port2017-07-12 19:13:29 -0700
committerTyler Port2017-07-12 19:13:29 -0700
commite228d17958141ab4b2a691f0226cbc32b62363fa (patch)
treecae7042c06d896cad6688ea254ddc49bc0417a70
parentf70eb0ca7899ada98c3d6c00a69794760ff20ba9 (diff)
downloadaur-e228d17958141ab4b2a691f0226cbc32b62363fa.tar.gz
more work to make ninja work, no pgo for now
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD48
2 files changed, 38 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7d269f972d4..c7510e9e35e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
# Generated by mksrcinfo v8
-# Tue Jul 11 02:02:32 UTC 2017
+# Thu Jul 13 02:13:14 UTC 2017
pkgbase = llvm-polly-svn
- pkgver = 5.0.0svn_r307611
+ pkgver = 5.0.0svn_r307868
pkgrel = 1
url = http://llvm.org/
arch = i686
@@ -38,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_r307611-1
+ depends = llvm-libs-polly-svn=5.0.0svn_r307868-1
provides = llvm
conflicts = llvm,
conflicts = llvm-svn
@@ -54,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_r307611-1
+ depends = llvm-polly-svn=5.0.0svn_r307868-1
depends = ocaml=4.04.1
depends = ocaml-ctypes
provides = llvm-ocaml
@@ -64,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_r307611-1
+ depends = llvm-libs-polly-svn=5.0.0svn_r307868-1
provides = lld
conflicts = lld,
conflicts = lld-svn
@@ -73,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_r307611-1
+ depends = llvm-libs-polly-svn=5.0.0svn_r307868-1
depends = libedit
depends = libxml2
depends = python2
@@ -84,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_r307611-1
+ depends = llvm-polly-svn=5.0.0svn_r307868-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.
@@ -97,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_r307611-1
+ depends = clang-polly-svn=5.0.0svn_r307868-1
depends = perl
depends = python2
provides = clang-analyzer
@@ -108,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_r307611-1
+ depends = clang-polly-svn=5.0.0svn_r307868-1
provides = clang-compiler-rt
conflicts = clang-compiler-rt,
conflicts = clang-compiler-rt-svn
@@ -117,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_r307611-1
+ depends = clang-polly-svn=5.0.0svn_r307868-1
provides = clang-tools-extra
conflicts = clang-tools-extra,
conflicts = clang-tools-extra-svn
diff --git a/PKGBUILD b/PKGBUILD
index 4a37ad81cb1..25eb80419dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,7 +25,7 @@ pkgname=(
)
_pkgname='llvm'
-pkgver=5.0.0svn_r307640
+pkgver=5.0.0svn_r307868
pkgver() {
cd "$pkgname"
@@ -211,9 +211,11 @@ build() {
# -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
# -DLLVM_BINUTILS_INCDIR:PATH=/usr/include \
# "../${_pkgname}"
+# -DPGO_INSTRUMENT_LTO:BOOL=ON \
+# -C "../clang/cmake/caches/PGO.cmake" \
+# -DBOOTSTRAP_LLVM_ENABLE_LLD:BOOL=ON \
+
cmake -G 'Ninja' \
- -DPGO_INSTRUMENT_LTO:BOOL=ON \
- -C "../clang/cmake/caches/PGO.cmake" \
-DCMAKE_BUILD_TYPE:STRING=Release \
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DLLVM_APPEND_VC_REV:BOOL=ON \
@@ -231,13 +233,16 @@ build() {
-DLLVM_BINUTILS_INCDIR:PATH=/usr/include \
-DLLVM_ENABLE_LTO=Thin \
-DLLVM_PARALLEL_LINK_JOBS=1 \
- -DBOOTSTRAP_LLVM_ENABLE_LLD:BOOL=ON \
+ -DCMAKE_C_COMPILER=/usr/bin/clang \
+ -DCMAKE_CXX_COMPILER=/usr/bin/clang++ \
+ -DCMAKE_RANLIB=/usr/bin/llvm-ranlib \
+ -DCMAKE_AR=/usr/bin/llvm-ar \
"../${_pkgname}"
- ninja stage2
+ ninja
ninja ocaml_doc
- # make
- # make ocaml_doc
+ #make stage2 -j6
+ #make ocaml_doc -j6
}
check() {
@@ -246,9 +251,11 @@ check() {
# 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
- [[ "${CARCH}" == "i686" ]] || LD_LIBRARY_PATH="${srcdir}/build/lib" ninja stage2-check-llvm
+ [[ "${CARCH}" == "i686" ]] || LD_LIBRARY_PATH="${srcdir}/build/lib" ninja check
- ninja stage2-check-clang
+ ninja check-all
+ #ninja check-lld
+ #ninja check-polly
#make check-clang
#make check-polly
}
@@ -268,7 +275,7 @@ package_llvm-polly-svn() {
sed -i '/\(clang\|lld\|lldb\)\/cmake_install.cmake/d' tools/cmake_install.cmake
#make DESTDIR="${pkgdir}" install
- ninja DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja install
# The runtime libraries get installed in llvm-libs-svn
rm -f "${pkgdir}"/usr/lib/lib{LLVM,LTO}{,-*}.so{,.*}
@@ -309,10 +316,11 @@ package_lldb-polly-svn() {
provides=('lldb')
conflicts=('lldb')
- cd "${srcdir}/build/tools/lldb"
-
- make DESTDIR="${pkgdir}" install
+ cd "${srcdir}/build"
+ DESTDIR="${pkgdir}" ninja install-lldb
+
+ cd "${srcdir}/build/tools/lldb"
_fix_python_exec_path \
"${pkgdir}${_py_sitepkg_dir}/lldb/utils/symbolication.py"
@@ -334,7 +342,7 @@ package_llvm-libs-polly-svn() {
cd "${srcdir}/build"
- make DESTDIR="${pkgdir}" install-{LLVM,LTO}
+ DESTDIR="${pkgdir}" ninja install-{LLVM,LTO}
# Moved from the llvm-svn package here
mv "${srcdir}"/{BugpointPasses,LLVMgold,LLVMHello}.so "${pkgdir}/usr/lib/"
@@ -386,9 +394,9 @@ package_lld-polly-svn() {
provides=('lld')
conflicts=('lld', 'lld-svn')
- cd "${srcdir}/build/tools/lld"
+ cd "${srcdir}/build"
- make DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja install-lld
# Clean up documentation
# TODO: This may at some point not be needed any more.
@@ -419,8 +427,8 @@ package_clang-polly-svn() {
sed -i \
"s|^\([[:blank:]]*include(\"${srcdir}/build/tools/clang/tools/extra/cmake_install.cmake\")\)$|#\1|" \
tools/cmake_install.cmake
-
- make DESTDIR="${pkgdir}" install
+ cd "${srcdir}/build"
+ DESTDIR="${pkgdir}" ninja install-clang
# The Clang Static Analyzer is installed in a separate package
# TODO: Probably there's more elegant way to achieve this.
@@ -518,7 +526,7 @@ package_clang-compiler-rt-polly-svn() {
cd "${srcdir}/build/projects/compiler-rt"
- make DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja install
_install_licenses "${srcdir}/compiler-rt"
}
@@ -535,7 +543,7 @@ package_clang-tools-extra-polly-svn() {
cd "${srcdir}/build/tools/clang/tools/extra"
- make DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja install
_install_licenses "${srcdir}/clang-tools-extra"
}