From 7234749577dc4312a8bba0ede55a94d6088ad572 Mon Sep 17 00:00:00 2001 From: travankor Date: Tue, 10 Mar 2020 09:38:45 -0700 Subject: [PATCH] dmd: update to 2.091.0. --- srcpkgs/dmd/files/musl.patch | 11 ----------- srcpkgs/dmd/template | 19 +++++-------------- 2 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 srcpkgs/dmd/files/musl.patch diff --git a/srcpkgs/dmd/files/musl.patch b/srcpkgs/dmd/files/musl.patch deleted file mode 100644 index f2e4538c404..00000000000 --- a/srcpkgs/dmd/files/musl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dmd/src/dmd/mars.d -+++ dmd/src/dmd/mars.d -@@ -1101,7 +1101,7 @@ void addDefaultVersionIdentifiers(const ref Param params) - VersionCondition.addPredefinedGlobalIdent("Posix"); - VersionCondition.addPredefinedGlobalIdent("linux"); - VersionCondition.addPredefinedGlobalIdent("ELFv1"); -- VersionCondition.addPredefinedGlobalIdent("CRuntime_Glibc"); -+ VersionCondition.addPredefinedGlobalIdent("CRuntime_Musl"); - VersionCondition.addPredefinedGlobalIdent("CppRuntime_Gcc"); - } - else if (params.isOSX) diff --git a/srcpkgs/dmd/template b/srcpkgs/dmd/template index f8ab9049d59..6167a347f49 100644 --- a/srcpkgs/dmd/template +++ b/srcpkgs/dmd/template @@ -1,6 +1,6 @@ # Template file for 'dmd' pkgname=dmd -version=2.089.1 +version=2.091.0 revision=1 create_wrksrc=yes hostmakedepends="which" @@ -15,10 +15,10 @@ distfiles=" https://github.com/dlang/druntime/archive/v${version}.tar.gz>druntime-${version}.tar.gz https://github.com/dlang/phobos/archive/v${version}.tar.gz>phobos-${version}.tar.gz http://downloads.dlang.org/releases/2.x/${version}/dmd.${version}.linux.tar.xz" -checksum="4a55f080ab72ce4cbfbece241613636b949cecfad6a8656732b6bebff4c2008c - 740c62c7d8b91b188c9b6d6a4b1f7065ee28620a30d687e1957c8775f9516e46 - 003227ea649ee67c2ae0e09035d73abcc0a2e6edd46d439747d787369857a1e9 - ad5b5c6986123eb21e1069fe7aec54ec117f7480a6b9535dd1a40e00ee160d70" +checksum="bcca38f4b80b51ae0a1955dc29e6cbfaa4d01d94869ddfcacf9292898c34343a + cc8ba196b08cca04488d97d0e35c878f7351b7d8128aec90eaa312d2bd9a6af2 + df9f81eecda4366adc5ca9ed31a0b4474c248544b120ff6fa3f6cb45917d8769 + 6e4bd4ee73a553921cdca7e3e21768b842b18186d07c0b4898fbd13a359875c0" conf_files="/etc/dmd.conf" provides="d-compiler-${version}_${revision}" conflicts="dmd-bootstrap dmd2.081" @@ -38,15 +38,6 @@ post_extract() { mv phobos-${version} phobos } -pre_configure() { - case "$XBPS_TARGET_MACHINE" in - *-musl) patch -p0 < ${FILESDIR}/musl.patch - if [ "$XBPS_TARGET_MACHINE" = "i686-musl" ]; then - patch -p0 < ${FILESDIR}/i686-musl.patch - fi - esac -} - do_build() { local dmd