[arch-commits] Commit in llvm/trunk (PKGBUILD)

[Evangelos Foutras]

    Date: Friday, September 5, 2014 @ 18:47:06
  Author: foutrelis
Revision: 221020

upgpkg: llvm 3.5.0-1

New upstream release.

Modified:
  llvm/trunk/PKGBUILD

----------+
 PKGBUILD |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-05 16:34:56 UTC (rev 221019)
+++ PKGBUILD	2014-09-05 16:47:06 UTC (rev 221020)
@@ -49,11 +49,12 @@
   mv "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt
 
   # Fix docs installation directory
-  sed -i 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
+  sed -i 's:$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
     Makefile.config.in
 
   # Fix definition of LLVM_CMAKE_DIR in LLVMConfig.cmake
-  sed -i 's/$(DESTDIR)$(PROJ_prefix)/$(PROJ_prefix)/' cmake/modules/Makefile
+  sed -i '/@LLVM_CONFIG_CMAKE_DIR@/s:$(PROJ_cmake):$(PROJ_prefix)/share/llvm/cmake:' \
+    cmake/modules/Makefile
 
   # Fix build with GCC 4.9 (patch from Debian)
   # http://llvm.org/bugs/show_bug.cgi?id=20067
@@ -228,7 +229,9 @@
       clang-format.py \
       "$pkgdir/usr/share/$pkgname/"
     cp git-clang-format "$pkgdir/usr/bin/"
-    sed -i 's|/usr/bin/python$|&2|' "$pkgdir/usr/bin/git-clang-format"
+    sed -i 's|/usr/bin/python$|&2|' \
+      "$pkgdir/usr/bin/git-clang-format" \
+      "$pkgdir/usr/share/$pkgname/clang-format-diff.py"
   )
 
   install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"