switch to ninja and use pgo stage2

2 files changed, 23 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 52d99d8b60f7..7d269f972d45 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Tue Jul 11 01:41:27 UTC 2017
+# Tue Jul 11 02:02:32 UTC 2017
 pkgbase = llvm-polly-svn
-	pkgver = 5.0.0svn_r307609
+	pkgver = 5.0.0svn_r307611
 	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_r307609-1
+	depends = llvm-libs-polly-svn=5.0.0svn_r307611-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_r307609-1
+	depends = llvm-polly-svn=5.0.0svn_r307611-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_r307609-1
+	depends = llvm-libs-polly-svn=5.0.0svn_r307611-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_r307609-1
+	depends = llvm-libs-polly-svn=5.0.0svn_r307611-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_r307609-1
+	depends = llvm-polly-svn=5.0.0svn_r307611-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_r307609-1
+	depends = clang-polly-svn=5.0.0svn_r307611-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_r307609-1
+	depends = clang-polly-svn=5.0.0svn_r307611-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_r307609-1
+	depends = clang-polly-svn=5.0.0svn_r307611-1
 	provides = clang-tools-extra
 	conflicts = clang-tools-extra,
 	conflicts = clang-tools-extra-svn
diff --git a/PKGBUILD b/PKGBUILD
index 2c0fb29224a5..ed24683dc0c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,7 +25,7 @@ pkgname=(
 )
 _pkgname='llvm'
 
-pkgver=5.0.0svn_r307609
+pkgver=5.0.0svn_r307611
 
 pkgver() {
   cd "$pkgname"
@@ -211,28 +211,29 @@ build() {
     #     -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
     #     -DLLVM_BINUTILS_INCDIR:PATH=/usr/include \
     #     "../${_pkgname}"
-    cmake -G Ninja \
+    cmake -G 'Ninja' \
         -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 \
-        -C "../clang/cmake/caches/PGO.cmake" "../${_pkgname}"
+        -C "../clang/cmake/caches/PGO.cmake" \
+        "../${_pkgname}"
 
     ninja stage2
     ninja ocaml_doc
-    #make
-    #make ocaml_doc
+    # make
+    # make ocaml_doc
 }
 
 check() {
@@ -242,7 +243,7 @@ check() {
     #[[ "${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
+    ninja check-polly
     #make check-clang
     #make check-polly
 }
@@ -261,7 +262,8 @@ package_llvm-polly-svn() {
     # Disable automatic installation of components that go into subpackages
     sed -i '/\(clang\|lld\|lldb\)\/cmake_install.cmake/d' tools/cmake_install.cmake
 
-    make DESTDIR="${pkgdir}" install
+    #make DESTDIR="${pkgdir}" install
+    ninja DESTDIR="${pkgdir}" install
 
     # The runtime libraries get installed in llvm-libs-svn
     rm -f "${pkgdir}"/usr/lib/lib{LLVM,LTO}{,-*}.so{,.*}