From 07f83ffb9bb876111b6738b93491e193296706ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sat, 22 May 2021 03:51:24 -0300 Subject: [PATCH] ldc: update to 1.26.0. Also move to llvm12 and add llvm-unwind-devel to depends, since it's required by some packages when building things with ldc. Forcing linking against libunwind from llvm is necessary, otherwise the resulting runtime is underlinked and fails to find the unw_* symbols it needs. Argument taken from Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/blob/aaaa982c682d6c5655d8b89538c18e05bd6443e6/community/ldc/APKBUILD --- common/shlibs | 10 +++++----- srcpkgs/ldc/template | 19 ++++++++++++------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/common/shlibs b/common/shlibs index 221babe952..666da46e04 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2161,11 +2161,11 @@ libFcitx5Config.so.6 libfcitx5-5.0.5_1 libFcitx5GClient.so.2 fcitx5-gtk-5.0.4_1 libFcitx5Qt5DBusAddons.so.1 fcitx5-qt5-5.0.3_1 libFcitx5Qt5WidgetsAddons.so.2 fcitx5-qt5-5.0.3_1 -libdruntime-ldc-debug-shared.so.94 ldc-runtime-1.24.0_1 -libdruntime-ldc-shared.so.94 ldc-runtime-1.24.0_1 -libphobos2-ldc-shared.so.94 ldc-runtime-1.24.0_1 -libphobos2-ldc-debug-shared.so.94 ldc-runtime-1.24.0_1 -libldc-jit.so.94 ldc-runtime-1.24.0_1 +libdruntime-ldc-debug-shared.so.96 ldc-runtime-1.26.0_1 +libdruntime-ldc-shared.so.96 ldc-runtime-1.26.0_1 +libphobos2-ldc-shared.so.96 ldc-runtime-1.26.0_1 +libphobos2-ldc-debug-shared.so.96 ldc-runtime-1.26.0_1 +libldc-jit.so.96 ldc-runtime-1.26.0_1 libmarblewidget-qt5.so.28 marble5-17.12.2_1 libastro.so.2 marble5-17.12.2_1 libparrot.so.6.9.0 parrot-6.9.0_1 diff --git a/srcpkgs/ldc/template b/srcpkgs/ldc/template index 45d5c7f7be..3964943305 100644 --- a/srcpkgs/ldc/template +++ b/srcpkgs/ldc/template @@ -1,27 +1,32 @@ # Template file for 'ldc' pkgname=ldc -version=1.24.0 -revision=2 +version=1.26.0 +revision=1 wrksrc="ldc-${version}-src" build_style=cmake configure_args=" -DINCLUDE_INSTALL_DIR=/usr/include/dlang/ldc -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo - -DBASH_COMPLETION_COMPLETIONSDIR=/usr/share/bash-completion" + -DBASH_COMPLETION_COMPLETIONSDIR=/usr/share/bash-completion + -DC_SYSTEM_LIBS='unwind;m;pthread;rt;dl'" conf_files="/etc/ldc2.conf" -hostmakedepends="dmd llvm11 perl pkg-config" -makedepends="libcurl-devel libffi-devel ncurses-devel zlib-devel" -depends="ldc-runtime" +hostmakedepends="dmd llvm12 perl pkg-config" +makedepends="libcurl-devel libffi-devel ncurses-devel zlib-devel + llvm-libunwind-devel" +depends="ldc-runtime llvm-libunwind-devel" +checkdepends="python3 tzdata" short_desc="Portable D programming language compiler based on LLVM" maintainer="Auri " license="BSD-3-Clause, BSL-1.0" homepage="https://wiki.dlang.org/LDC" changelog="https://raw.githubusercontent.com/ldc-developers/ldc/master/CHANGELOG.md" distfiles="https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz" -checksum=fd9561ade916e9279bdcc166cf0e4836449c24e695ab4470297882588adbba3c +checksum=c18f4c76869f0196b459dcd6196c7eaea1b097cc422cf3771de394f6c0ef7474 nopie=yes nocross="dmd compilation fails on cross" +# tests timeout on musl; also require unpackaged python3-lit +make_check=no post_install() { vlicense LICENSE