[arch-commits] Commit in ldc/repos/community-x86_64 (3 files)

Dan Printzell wild at archlinux.org
Tue Feb 23 21:45:15 UTC 2021


    Date: Tuesday, February 23, 2021 @ 21:45:15
  Author: wild
Revision: 870776

archrelease: copy trunk to community-x86_64

Added:
  ldc/repos/community-x86_64/PKGBUILD
    (from rev 870775, ldc/trunk/PKGBUILD)
Deleted:
  ldc/repos/community-x86_64/PKGBUILD
  ldc/repos/community-x86_64/llvm-11.1.0.patch

-------------------+
 PKGBUILD          |  222 +++++++++++++++++++++++++---------------------------
 llvm-11.1.0.patch |   12 --
 2 files changed, 108 insertions(+), 126 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-23 21:45:10 UTC (rev 870775)
+++ PKGBUILD	2021-02-23 21:45:15 UTC (rev 870776)
@@ -1,114 +0,0 @@
-# Maintainer: Dan Printzell <arch at vild.io>
-# Contributor: Mihails Strasuns <public at dicebot.lv>
-# Contributor: Sven-Hendrik Haase <sh at lutzhaase.com>
-
-pkgname=('ldc' 'liblphobos')
-groups=('dlang' 'dlang-ldc')
-pkgver=1.24.0
-_pkgcommit=7b306c5ed148e39bcbd7143ca32416afe1a9ee5f
-_dversion=2.094.1
-_clangversion=11.1.0 # related to where ldc2 looks for compiler-rt sanitizers
-epoch=2
-pkgrel=4
-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')
-
-source=(
-    "git+https://github.com/ldc-developers/ldc#commit=$_pkgcommit"
-    "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')
-
-prepare() {
-    cd "$srcdir/ldc"
-
-    git submodule init
-    git config submodule.druntime.url "$srcdir/ldc-druntime"
-    git config submodule.phobos.url "$srcdir/ldc-phobos"
-    git config submodule.tests/d2/dmd-testsuite.url "$srcdir/ldc-testsuite"
-    git submodule update
-
-    # 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() {
-    cd "$srcdir/ldc"
-
-    mkdir -p build && cd build
-
-    cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DINCLUDE_INSTALL_DIR=/usr/include/dlang/ldc \
-    -DBUILD_SHARED_LIBS=BOTH \
-    -DBUILD_LTO_LIBS=ON \
-    -DLDC_WITH_LLD=OFF \
-    -DD_COMPILER_FLAGS="-link-defaultlib-shared=false -linker=gold" \
-    -DADDITIONAL_DEFAULT_LDC_SWITCHES="\"-link-defaultlib-shared\"" \
-    ..
-    make
-}
-
-check() {
-    cd "$srcdir/ldc/build"
-    make all-test-runners
-}
-
-package_ldc() {
-    depends=('liblphobos' 'llvm-libs' 'gcc' 'compiler-rt')
-    backup=('etc/ldc2.conf')
-    provides=("d-compiler=$_dversion")
-
-    cd "$srcdir/ldc/build"
-    make install DESTDIR="$pkgdir"
-
-    # move bash-completion
-    mkdir -p "$pkgdir/usr/share/bash-completion/completions/"
-    mv "$pkgdir/etc/bash_completion.d/ldc2" "$pkgdir/usr/share/bash-completion/completions/"
-    rm -rf "$pkgdir/etc/bash_completion.d"
-
-    # remove liblphobos files
-    rm -rf "$pkgdir/usr/include"
-    rm -rf "$pkgdir/usr/lib"
-
-    # symlinks
-    ln -s /usr/share/bash-completion/completions/ldc2 "$pkgdir/usr/share/bash-completion/completions/ldc"
-    ln -s /usr/bin/ldc2 "$pkgdir/usr/bin/ldc"
-    ln -s /usr/bin/ldmd2 "$pkgdir/usr/bin/ldmd"
-
-    # licenses
-    install -D -m644 "$srcdir/ldc/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_liblphobos() {
-    provides=('d-runtime' 'd-stdlib')
-    depends=('curl' 'llvm-libs')
-    options=('staticlibs' '!strip')
-
-    cd "$srcdir/ldc/build"
-    make install DESTDIR="$pkgdir"
-
-    # remove ldc files
-    rm -rf "$pkgdir/usr/bin/"
-    rm -rf "$pkgdir/etc/"
-
-    # licenses
-    install -D -m644 "$srcdir/ldc/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: ldc/repos/community-x86_64/PKGBUILD (from rev 870775, ldc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-02-23 21:45:15 UTC (rev 870776)
@@ -0,0 +1,108 @@
+# Maintainer: Dan Printzell <arch at vild.io>
+# Contributor: Mihails Strasuns <public at dicebot.lv>
+# Contributor: Sven-Hendrik Haase <sh at lutzhaase.com>
+
+pkgname=('ldc' 'liblphobos')
+groups=('dlang' 'dlang-ldc')
+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=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' 'ninja')
+
+source=(
+    "git+https://github.com/ldc-developers/ldc#commit=$_pkgcommit"
+    "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"
+)
+
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP')
+
+prepare() {
+    cd "$srcdir/ldc"
+
+    git submodule init
+    git config submodule.druntime.url "$srcdir/ldc-druntime"
+    git config submodule.phobos.url "$srcdir/ldc-phobos"
+    git config submodule.tests/d2/dmd-testsuite.url "$srcdir/ldc-testsuite"
+    git submodule update
+
+    # Set version used for path construction in getFullClangCompilerRTLibPath()
+    sed -i "s/ldc::llvm_version_base/\"$_clangversion\"/" driver/linker-gcc.cpp
+}
+
+build() {
+    cd "$srcdir/ldc"
+
+    mkdir -p build && cd build
+
+    cmake -GNinja \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DINCLUDE_INSTALL_DIR=/usr/include/dlang/ldc \
+    -DBUILD_SHARED_LIBS=BOTH \
+    -DBUILD_LTO_LIBS=ON \
+    -DLDC_WITH_LLD=OFF \
+    -DD_COMPILER_FLAGS="-link-defaultlib-shared=false -linker=gold" \
+    -DADDITIONAL_DEFAULT_LDC_SWITCHES="\"-link-defaultlib-shared\"" \
+    ..
+    ninja
+}
+
+check() {
+    cd "$srcdir/ldc/build"
+    ninja all-test-runners
+}
+
+package_ldc() {
+    depends=('liblphobos' 'llvm-libs' 'gcc' 'compiler-rt')
+    backup=('etc/ldc2.conf')
+    provides=("d-compiler=$_dversion")
+
+    cd "$srcdir/ldc/build"
+    DESTDIR="$pkgdir" ninja install
+
+    # move bash-completion
+    mkdir -p "$pkgdir/usr/share/bash-completion/completions/"
+    mv "$pkgdir/etc/bash_completion.d/ldc2" "$pkgdir/usr/share/bash-completion/completions/"
+    rm -rf "$pkgdir/etc/bash_completion.d"
+
+    # remove liblphobos files
+    rm -rf "$pkgdir/usr/include"
+    rm -rf "$pkgdir/usr/lib"
+
+    # symlinks
+    ln -s /usr/share/bash-completion/completions/ldc2 "$pkgdir/usr/share/bash-completion/completions/ldc"
+    ln -s /usr/bin/ldc2 "$pkgdir/usr/bin/ldc"
+    ln -s /usr/bin/ldmd2 "$pkgdir/usr/bin/ldmd"
+
+    # licenses
+    install -D -m644 "$srcdir/ldc/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_liblphobos() {
+    provides=('d-runtime' 'd-stdlib')
+    depends=('curl' 'llvm-libs')
+    options=('staticlibs' '!strip')
+
+    cd "$srcdir/ldc/build"
+    DESTDIR="$pkgdir" ninja install
+
+    # remove ldc files
+    rm -rf "$pkgdir/usr/bin/"
+    rm -rf "$pkgdir/etc/"
+
+    # licenses
+    install -D -m644 "$srcdir/ldc/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

Deleted: llvm-11.1.0.patch
===================================================================
--- llvm-11.1.0.patch	2021-02-23 21:45:10 UTC (rev 870775)
+++ llvm-11.1.0.patch	2021-02-23 21:45:15 UTC (rev 870776)
@@ -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);



More information about the arch-commits mailing list