From e70e9c1c3401b0809a7415b443a0f7392053fb05 Mon Sep 17 00:00:00 2001
From: Chaoting Liu <brli@chakralinux.org>
Date: Mon, 3 Oct 2016 09:42:54 +0100
Subject: [PATCH] llvm: update to 3.9.0, various patch removed as fixed

---
 llvm/PKGBUILD | 44 +++++++++++---------------------------------
 1 file changed, 11 insertions(+), 33 deletions(-)

diff --git a/llvm/PKGBUILD b/llvm/PKGBUILD
index f26b2a20c..b0c5c5059 100644
--- a/llvm/PKGBUILD
+++ b/llvm/PKGBUILD
@@ -8,9 +8,9 @@
 
 pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'lldb' 'clang' 'clang-analyzer'
          'clang-tools-extra')
-pkgver=3.7.0
+pkgver=3.9.0
 pkgrel=1
-_ocaml_ver=4.02.3
+_ocaml_ver=4.03.0
 arch=('x86_64')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
@@ -22,25 +22,17 @@ source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.xz{,.sig}
         http://llvm.org/releases/$pkgver/clang-tools-extra-$pkgver.src.tar.xz{,.sig}
         http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.xz{,.sig}
         http://llvm.org/releases/$pkgver/lldb-$pkgver.src.tar.xz{,.sig}
-        llvm-3.7.0-link-tools-against-libLLVM.patch
-        llvm-3.7.0-export-more-symbols.patch
-        clang-tools-extra-3.7.0-install-clang-query.patch
-        lldb-3.7.0-avoid-linking-to-libLLVM.patch
         llvm-Config-llvm-config.h)
-sha256sums=('ab45895f9dcdad1e140a3a79fd709f64b05ad7364e308c0e582c5b02e9cc3153'
+sha256sums=('66c73179da42cee1386371641241f79ded250e117a79f571bbd69e56daa48948'
             'SKIP'
-            '4ed740c5a91df1c90a4118c5154851d6a475f39a91346bdf268c1c29c13aa1cc'
+            '7596a7c7d9376d0c89e60028fe1ceb4d3e535e8ea8b89e0eb094e0dcb3183d28'
             'SKIP'
-            '8ae8a0a3a96b7a700412d67df0af172cb2fc1326beec575fcc0f71d2e72709cd'
+            '5b7aec46ec8e999ec683c87ad744082e1133781ee4b01905b4bdae5d20785f14'
             'SKIP'
-            '227fa998520bc94974a428dc8e7654d9bdf277e5bc70d4064ebc05691bd62b0b'
+            'e0e5224fcd5740b61e416c549dd3dcda92f10c524216c1edb5e979e42078a59a'
             'SKIP'
-            'f4d7505bc111044eaa4033af012221e492938405b62522b8e3e354c20c4b71e9'
+            '61280e07411e3f2b4cca0067412b39c16b0a9edd19d304d3fc90249899d12384'
             'SKIP'
-            'cf9c8b4d70b4547eda162644658c5c203c3139fcea6c75003b6cd7dc11a8cccc'
-            'a1c9f36b97c639666ab6a1bd647a08a027e93e3d3cfd6f5af9c36e757599ce81'
-            '3abf85430c275ecb8dbb526ecb82b1c9f4b4f782a8a43b5a06d040ec0baba7e7'
-            '2d53b6ed4c7620eeade87e7761b98093a0434801ddd599056daed7881141fb01'
             '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
 validpgpkeys=('11E521D646982372EB577A1F8F0871F202119294'
               'B6C8F98282B944E3B0D5C2530FC3042E345AD05D')
@@ -58,24 +50,10 @@ prepare() {
 
   mv "$srcdir/lldb-$pkgver.src" tools/lldb
 
-  # Backport LLVM_LINK_LLVM_DYLIB option
-  # https://bugs.archlinux.org/task/46392
-  patch -Np1 -i ../llvm-3.7.0-link-tools-against-libLLVM.patch
-
-  # https://llvm.org/bugs/show_bug.cgi?id=24157
-  patch -Np2 -i ../llvm-3.7.0-export-more-symbols.patch
-
-  # https://llvm.org/bugs/show_bug.cgi?id=24046
-  # Upstreamed - http://reviews.llvm.org/D13206
-  patch -d tools/clang/tools/extra -Np1 <../clang-tools-extra-3.7.0-install-clang-query.patch
-
-  # https://llvm.org/bugs/show_bug.cgi?id=24953
-  patch -d tools/lldb -Np1 <../lldb-3.7.0-avoid-linking-to-libLLVM.patch
-
   # Use Python 2
   find tools/lldb -name Makefile -exec sed -i 's/python-config/python2-config/' {} +
   sed -i 's|/usr/bin/env python|&2|' \
-    tools/lldb/scripts/Python/{build-swig-Python,finish-swig-Python-LLDB}.sh
+    tools/lldb/scripts/Python/finish-swig-Python-LLDB.sh
 
   mkdir build
 }
@@ -234,15 +212,15 @@ package_clang-analyzer() {
 
   # Relocate man page
   install -d "$pkgdir/usr/share/man/man1"
-  mv "$pkgdir/usr/lib/clang-analyzer/scan-build/scan-build.1" \
+  mv "$pkgdir/usr/lib/clang-analyzer/scan-build/man/scan-build.1" \
     "$pkgdir/usr/share/man/man1/"
 
   # Use Python 2
   sed -i \
     -e 's|env python$|&2|' \
     -e 's|/usr/bin/python$|&2|' \
-    "$pkgdir/usr/lib/clang-analyzer/scan-view/scan-view" \
-    "$pkgdir/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer"
+    "$pkgdir/usr/lib/clang-analyzer/scan-view/bin/scan-view" \
+    "$pkgdir/usr/lib/clang-analyzer/scan-build/bin/set-xcode-analyzer"
 
   # Compile Python scripts
   python2 -m compileall "$pkgdir/usr/lib/clang-analyzer"