[arch-commits] Commit in clang/trunk (PKGBUILD clang-doc-build-as-clang_tool.patch)

[Evangelos Foutras]

    Date: Friday, April 26, 2019 @ 21:24:58
  Author: foutrelis
Revision: 352150

upgpkg: clang 8.0.0-4

Ship /usr/bin/clang-doc (FS#62470).

Added:
  clang/trunk/clang-doc-build-as-clang_tool.patch
Modified:
  clang/trunk/PKGBUILD

-------------------------------------+
 PKGBUILD                            |    7 ++++++-
 clang-doc-build-as-clang_tool.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-26 21:04:51 UTC (rev 352149)
+++ PKGBUILD	2019-04-26 21:24:58 UTC (rev 352150)
@@ -3,7 +3,7 @@
 
 pkgname=clang
 pkgver=8.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="C language family frontend for LLVM"
 arch=('x86_64')
 url="https://clang.llvm.org/"
@@ -22,6 +22,7 @@
         0001-OpenCL-Change-type-of-block-pointer-for-OpenCL.patch
         0002-OpenCL-Simplify-LLVM-IR-generated-for-OpenCL-blocks.patch
         0003-OpenCL-Fix-assertion-due-to-blocks.patch
+        clang-doc-build-as-clang_tool.patch
         enable-SSP-and-PIE-by-default.patch)
 sha256sums=('084c115aab0084e63b23eee8c233abb6739c399e29966eaeccfc6e088e0b736b'
             'SKIP'
@@ -32,6 +33,7 @@
             'fbb6d3c8135942e458bcad8882605a623bcd09bdec488eb0800e3afee0061e3a'
             '91c49139e02c6d29f6201aa394868939b991b39b84215c082392ea96fbd8c334'
             '191434810b5298331908ea1e193203e8441693da900238344e946ee6a79dad31'
+            '1dfa5f93c0c084b8a25ca79ef9e2fe63a476826629e8ef366e0a6eaf5fa10625'
             '58f86da25eb230ed6d423b5b61870cbf3bef88f38103ca676a2c7f34b2372171')
 validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at chromium.org>
 validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar at redhat.com>
@@ -46,6 +48,9 @@
   patch -Np1 -i ../0001-OpenCL-Change-type-of-block-pointer-for-OpenCL.patch
   patch -Np1 -i ../0002-OpenCL-Simplify-LLVM-IR-generated-for-OpenCL-blocks.patch
   patch -Np1 -i ../0003-OpenCL-Fix-assertion-due-to-blocks.patch
+
+  # Fix inclusion of /usr/bin/clang-doc
+  patch -Np1 -d tools/extra <../clang-doc-build-as-clang_tool.patch
 }
 
 build() {

Added: clang-doc-build-as-clang_tool.patch
===================================================================
--- clang-doc-build-as-clang_tool.patch	                        (rev 0)
+++ clang-doc-build-as-clang_tool.patch	2019-04-26 21:24:58 UTC (rev 352150)
@@ -0,0 +1,26 @@
+From 45e92fcf45def2b59c06b6407c73b798eaa321ae Mon Sep 17 00:00:00 2001
+From: Julie Hockett <juliehockett at google.com>
+Date: Fri, 29 Mar 2019 16:56:36 +0000
+Subject: [PATCH] [clang-doc] Build as clang_tool
+
+Instead of as clang_executable.
+
+Differential Revision: https://reviews.llvm.org/D59974
+
+git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@357274 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ clang-doc/tool/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clang-doc/tool/CMakeLists.txt b/clang-doc/tool/CMakeLists.txt
+index d7f28cf681..35f99ea08e 100644
+--- a/clang-doc/tool/CMakeLists.txt
++++ b/clang-doc/tool/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
+ 
+-add_clang_executable(clang-doc
++add_clang_tool(clang-doc
+   ClangDocMain.cpp
+   )
+