[arch-commits] Commit in lld/trunk (PKGBUILD sphinx2.patch)

[Evangelos Foutras]

    Date: Saturday, July 20, 2019 @ 13:45:39
  Author: foutrelis
Revision: 358437

upgpkg: lld 8.0.1-1

New upstream release.

Added:
  lld/trunk/sphinx2.patch
Modified:
  lld/trunk/PKGBUILD

---------------+
 PKGBUILD      |   22 +++++++++++-----------
 sphinx2.patch |   13 +++++++++++++
 2 files changed, 24 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-20 13:22:29 UTC (rev 358436)
+++ PKGBUILD	2019-07-20 13:45:39 UTC (rev 358437)
@@ -2,7 +2,7 @@
 # Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
 
 pkgname=lld
-pkgver=8.0.0
+pkgver=8.0.1
 pkgrel=1
 pkgdesc="Linker from the LLVM project"
 arch=('x86_64')
@@ -10,12 +10,14 @@
 license=('custom:University of Illinois/NCSA Open Source License')
 depends=('llvm-libs')
 makedepends=('llvm' 'cmake' 'ninja' 'python-sphinx')
-source=(https://releases.llvm.org/$pkgver/$pkgname-$pkgver.src.tar.xz{,.sig}
-        https://releases.llvm.org/$pkgver/llvm-$pkgver.src.tar.xz{,.sig})
-sha256sums=('9caec8ec922e32ffa130f0fb08e4c5a242d7e68ce757631e425e9eba2e1a6e37'
+source=(https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/$pkgname-$pkgver.src.tar.xz{,.sig}
+        https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-$pkgver.src.tar.xz{,.sig}
+        sphinx2.patch)
+sha256sums=('9fba1e94249bd7913e8a6c3aadcb308b76c8c3d83c5ce36c99c3f34d73873d88'
             'SKIP'
-            '8872be1b12c61450cacc82b3d153eab02be2546ef34fa3580ed14137bb26224c'
-            'SKIP')
+            '44787a6d02f7140f145e2250d56c9f849334e11f9ae379827510ed72f12b75e7'
+            'SKIP'
+            '7f7cca66a16c5a4aca132bfa1d86a7a2ff33612ec47d3422dc91ad4cc1810646')
 validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at chromium.org>
 validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar at redhat.com>
 
@@ -22,6 +24,9 @@
 prepare() {
   cd "$srcdir/$pkgname-$pkgver.src"
   mkdir build
+
+  # https://bugs.llvm.org/show_bug.cgi?id=41789
+  patch -Np1 -i ../sphinx2.patch
 }
 
 build() {
@@ -44,11 +49,6 @@
 
 check() {
   cd "$srcdir/$pkgname-$pkgver.src/build"
-  if [[ -e /usr/bin/lld ]]; then
-    # TODO(foutrelis): tests use system lld if it exists; check if it's fixable
-    error "Cannot run the tests while lld is installed to the system"
-    return 1
-  fi
   ninja check-lld
 }
 

Added: sphinx2.patch
===================================================================
--- sphinx2.patch	                        (rev 0)
+++ sphinx2.patch	2019-07-20 13:45:39 UTC (rev 358437)
@@ -0,0 +1,13 @@
+diff --git a/docs/conf.py b/docs/conf.py
+index 62404b275..b5a3cdc68 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -134,7 +134,7 @@ html_last_updated_fmt = '%Y-%m-%d'
+ #html_use_smartypants = True
+ 
+ # Custom sidebar templates, maps document names to template names.
+-html_sidebars = {'index': 'indexsidebar.html'}
++html_sidebars = {'index': ['localtoc.html', 'relations.html', 'sourcelink.html', 'indexsidebar.html', 'searchbox.html']}
+ 
+ # Additional templates that should be rendered to pages, maps page names to
+ # template names.