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

[Evangelos Foutras]

    Date: Monday, October 12, 2020 @ 18:59:12
  Author: foutrelis
Revision: 723715

upgpkg: ldc 2:1.23.0-3: LLVM 11 rebuild

Modified:
  ldc/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-12 18:39:11 UTC (rev 723714)
+++ PKGBUILD	2020-10-12 18:59:12 UTC (rev 723715)
@@ -7,14 +7,14 @@
 pkgver=1.23.0
 _pkgcommit=a83dc56ad5a6ba87023756c05b54b5824053da96
 _dversion=2.093.1
-_clangversion=10.0.1 # related to where ldc2 looks for compiler-rt sanitizers
+_clangversion=11.0.0 # related to where ldc2 looks for compiler-rt sanitizers
 epoch=2
-pkgrel=2
+pkgrel=3
 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2"
 arch=('x86_64')
 url="https://github.com/ldc-developers/ldc"
 license=('BSD')
-makedepends=('git' 'cmake' 'llvm10' 'ldc')
+makedepends=('git' 'cmake' 'llvm' 'ldc')
 
 source=(
     "git+https://github.com/ldc-developers/ldc#commit=$_pkgcommit"
@@ -37,6 +37,11 @@
     git config submodule.tests/d2/dmd-testsuite.url "$srcdir/ldc-testsuite"
     git submodule update
 
+    # LLVM 11 support (https://github.com/ldc-developers/ldc/pull/3546)
+    git format-patch --stdout d33f6f9bbde8~..d33f6f9bbde8 \
+      ':!.travis.yml' ':!runtime/phobos' | patch -Np1
+    (cd runtime/phobos && git format-patch --stdout -1 788acc15d702 | patch -Np1)
+
     # Set version used for path construction in getFullClangCompilerRTLibPath()
     sed -i "s/ldc::llvm_version_base/\"$_clangversion\"/" driver/linker-gcc.cpp
 }
@@ -66,7 +71,7 @@
 }
 
 package_ldc() {
-    depends=('liblphobos' 'llvm10-libs' 'gcc' 'compiler-rt')
+    depends=('liblphobos' 'llvm-libs' 'gcc' 'compiler-rt')
     backup=('etc/ldc2.conf')
     provides=("d-compiler=$_dversion")
 
@@ -93,7 +98,7 @@
 
 package_liblphobos() {
     provides=('d-runtime' 'd-stdlib')
-    depends=('curl')
+    depends=('curl' 'llvm-libs')
     options=('staticlibs')
 
     cd "$srcdir/ldc/build"