[arch-commits] Commit in ldc/trunk (PKGBUILD llvm-11.1.0.patch)

[Dan Printzell]

    Date: Tuesday, February 23, 2021 @ 21:45:10
  Author: wild
Revision: 870775

upgpkg: ldc 2:1.25.0-1: Updated to 1.25.0

Modified:
  ldc/trunk/PKGBUILD
Deleted:
  ldc/trunk/llvm-11.1.0.patch

-------------------+
 PKGBUILD          |   28 +++++++++++-----------------
 llvm-11.1.0.patch |   12 ------------
 2 files changed, 11 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-23 21:44:46 UTC (rev 870774)
+++ PKGBUILD	2021-02-23 21:45:10 UTC (rev 870775)
@@ -4,17 +4,17 @@
 
 pkgname=('ldc' 'liblphobos')
 groups=('dlang' 'dlang-ldc')
-pkgver=1.24.0
-_pkgcommit=7b306c5ed148e39bcbd7143ca32416afe1a9ee5f
-_dversion=2.094.1
+pkgver=1.25.0
+_pkgcommit=72535b1713fca845e664924ee1333fdc9bb83528
+_dversion=2.095.1
 _clangversion=11.1.0 # related to where ldc2 looks for compiler-rt sanitizers
 epoch=2
-pkgrel=4
+pkgrel=1
 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' 'llvm' 'ldc')
+makedepends=('git' 'cmake' 'llvm' 'ldc' 'ninja')
 
 source=(
     "git+https://github.com/ldc-developers/ldc#commit=$_pkgcommit"
@@ -21,14 +21,12 @@
     "ldc-druntime::git+https://github.com/ldc-developers/druntime.git"
     "ldc-phobos::git+https://github.com/ldc-developers/phobos.git"
     "ldc-testsuite::git+https://github.com/ldc-developers/dmd-testsuite.git"
-    "llvm-11.1.0.patch"
 )
 
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
-            'SKIP'
-            'a26958fbfb958d055d02db4695ace6ce225f42e218a9bcb6e17452e06a717550')
+            'SKIP')
 
 prepare() {
     cd "$srcdir/ldc"
@@ -41,10 +39,6 @@
 
     # Set version used for path construction in getFullClangCompilerRTLibPath()
     sed -i "s/ldc::llvm_version_base/\"$_clangversion\"/" driver/linker-gcc.cpp
-
-    # Fix build with LLVM 11.1.0
-    patch -Np1 -d runtime/druntime <../llvm-11.1.0.patch
-    cp -v tools/ldc-profdata/llvm-profdata-11.{0,1}.cpp
 }
 
 build() {
@@ -52,7 +46,7 @@
 
     mkdir -p build && cd build
 
-    cmake \
+    cmake -GNinja \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
@@ -63,12 +57,12 @@
     -DD_COMPILER_FLAGS="-link-defaultlib-shared=false -linker=gold" \
     -DADDITIONAL_DEFAULT_LDC_SWITCHES="\"-link-defaultlib-shared\"" \
     ..
-    make
+    ninja
 }
 
 check() {
     cd "$srcdir/ldc/build"
-    make all-test-runners
+    ninja all-test-runners
 }
 
 package_ldc() {
@@ -77,7 +71,7 @@
     provides=("d-compiler=$_dversion")
 
     cd "$srcdir/ldc/build"
-    make install DESTDIR="$pkgdir"
+    DESTDIR="$pkgdir" ninja install
 
     # move bash-completion
     mkdir -p "$pkgdir/usr/share/bash-completion/completions/"
@@ -103,7 +97,7 @@
     options=('staticlibs' '!strip')
 
     cd "$srcdir/ldc/build"
-    make install DESTDIR="$pkgdir"
+    DESTDIR="$pkgdir" ninja install
 
     # remove ldc files
     rm -rf "$pkgdir/usr/bin/"

Deleted: llvm-11.1.0.patch
===================================================================
--- llvm-11.1.0.patch	2021-02-23 21:44:46 UTC (rev 870774)
+++ llvm-11.1.0.patch	2021-02-23 21:45:10 UTC (rev 870775)
@@ -1,12 +0,0 @@
-diff --git a/src/ldc/intrinsics.di b/src/ldc/intrinsics.di
-index f5d2c207..4502ac26 100644
---- a/src/ldc/intrinsics.di
-+++ b/src/ldc/intrinsics.di
-@@ -26,6 +26,7 @@ else version (LDC_LLVM_800)  enum LLVM_version =  800;
- else version (LDC_LLVM_900)  enum LLVM_version =  900;
- else version (LDC_LLVM_1000) enum LLVM_version = 1000;
- else version (LDC_LLVM_1100) enum LLVM_version = 1100;
-+else version (LDC_LLVM_1101) enum LLVM_version = 1101;
- else static assert(false, "LDC LLVM version not supported");
- 
- enum LLVM_atleast(int major) = (LLVM_version >= major * 100);