From 56f1913fafe97ec447938ed7671fe36e6ae0bf3c Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 13 Apr 2019 17:51:18 +0000 Subject: [PATCH] community/ldc to 1.15.0-1 --- community/ldc/PKGBUILD | 20 ++++++++------------ community/ldc/ldc2.conf | 19 ------------------- 2 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 community/ldc/ldc2.conf diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD index 9296075a3..8585649b5 100644 --- a/community/ldc/PKGBUILD +++ b/community/ldc/PKGBUILD @@ -10,31 +10,29 @@ buildarch=12 pkgname=('ldc' 'liblphobos') groups=('dlang' 'dlang-ldc') -pkgver=1.14.0 -_pkgcommit=e319c790f574d630ab0b930b980cfc1120ebe1d8 -_dversion=2.084.1 +pkgver=1.15.0 +_pkgcommit=766add462e980f8bab9934fcbf8659a6595f7944 +_dversion=2.085.1 _clangversion=8.0.0 # related to where ldc2 looks for compiler-rt sanitizers epoch=2 -pkgrel=2 +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' 'llvm7' 'ldc') +makedepends=('git' 'cmake' 'llvm' 'ldc') source=( "git+https://github.com/ldc-developers/ldc#commit=$_pkgcommit" "git+https://github.com/ldc-developers/druntime.git" "git+https://github.com/ldc-developers/phobos.git" "git+https://github.com/ldc-developers/dmd-testsuite.git" - "ldc2.conf" ) sha256sums=('SKIP' 'SKIP' 'SKIP' - 'SKIP' - '55ba34319db861a761797ac0075b0b1f5f4d37a243075aedb628aeedc77cc9d6') + 'SKIP') prepare() { cd "$srcdir/ldc" @@ -63,6 +61,7 @@ build() { -DBUILD_LTO_LIBS=OFF \ -DLDC_WITH_LLD=OFF \ -DD_COMPILER_FLAGS="-link-defaultlib-shared=false" \ + -DADDITIONAL_DEFAULT_LDC_SWITCHES="\"-link-defaultlib-shared\"" \ .. make } @@ -73,7 +72,7 @@ check() { } package_ldc() { - depends=('liblphobos' 'llvm7-libs' 'gcc' 'compiler-rt') + depends=('liblphobos' 'llvm-libs' 'gcc' 'compiler-rt') backup=('etc/ldc2.conf') provides=("d-compiler=$_dversion") @@ -96,9 +95,6 @@ package_ldc() { # licenses install -D -m644 "$srcdir/ldc/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - # default configuration files - install -D -m644 "$srcdir/ldc2.conf" "$pkgdir/etc/ldc2.conf" } package_liblphobos() { diff --git a/community/ldc/ldc2.conf b/community/ldc/ldc2.conf deleted file mode 100644 index ded2d8130..000000000 --- a/community/ldc/ldc2.conf +++ /dev/null @@ -1,19 +0,0 @@ -// See comments in driver/config.d in ldc source tree for grammar description of -// this config file. - -// The default group is required -default: -{ - // default switches injected before all explicit command-line switches - switches = [ - "-I/usr/include/dlang/ldc/ldc", - "-I/usr/include/dlang/ldc", - "-L--no-warn-search-mismatch", - "-defaultlib=phobos2-ldc,druntime-ldc", - "-link-defaultlib-shared" - ]; - // default switches appended after all explicit command-line switches - post-switches = [ - "-L-L/usr/lib" - ]; -};