From 88587fa5e714aa05b23898906524b2b764b230d7 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 1 May 2018 21:47:49 -0300 Subject: [PATCH] dmd: update to 2.080.0. Closes #14031. Signed-off-by: Enno Boland --- srcpkgs/dmd/patches/6193.patch | 145 --------------------------------- srcpkgs/dmd/template | 10 +-- 2 files changed, 5 insertions(+), 150 deletions(-) delete mode 100644 srcpkgs/dmd/patches/6193.patch diff --git a/srcpkgs/dmd/patches/6193.patch b/srcpkgs/dmd/patches/6193.patch deleted file mode 100644 index 09d16b46168..00000000000 --- a/srcpkgs/dmd/patches/6193.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 034988a0db917719b59887d8017addba76076b1f Mon Sep 17 00:00:00 2001 -From: Joakim -Date: Sat, 17 Feb 2018 14:25:07 +0530 -Subject: [PATCH] Add needed changes to get all tests passing with Musl - ---- - .../allocator/building_blocks/region.d | 6 +++ - std/socket.d | 44 +--------------------- - std/stdio.d | 24 ++++++------ - 3 files changed, 19 insertions(+), 55 deletions(-) - -diff --git a/std/experimental/allocator/building_blocks/region.d b/std/experimental/allocator/building_blocks/region.d -index 40a5387c64..c277498d1e 100644 ---- phobos/std/experimental/allocator/building_blocks/region.d -+++ phobos/std/experimental/allocator/building_blocks/region.d -@@ -647,6 +647,12 @@ struct InSituRegion(size_t size, size_t minAlign = platformAlignment) - assert((() nothrow @nogc => r2.deallocateAll())()); - } - -+version(CRuntime_Musl) -+{ -+ // sbrk and brk are disabled in Musl: -+ // https://git.musl-libc.org/cgit/musl/commit/?id=7a995fe706e519a4f55399776ef0df9596101f93 -+ // https://git.musl-libc.org/cgit/musl/commit/?id=863d628d93ea341b6a32661a1654320ce69f6a07 -+} else: - private extern(C) void* sbrk(long) nothrow @nogc; - private extern(C) int brk(shared void*) nothrow @nogc; - -diff --git a/std/socket.d b/std/socket.d -index 6a5e5ff2ba..8f0c8a225a 100644 ---- phobos/std/socket.d -+++ phobos/std/socket.d -@@ -163,47 +163,7 @@ string formatSocketError(int err) @trusted - { - cs = strerror_r(err, buf.ptr, buf.length); - } -- else version (OSX) -- { -- auto errs = strerror_r(err, buf.ptr, buf.length); -- if (errs == 0) -- cs = buf.ptr; -- else -- return "Socket error " ~ to!string(err); -- } -- else version (FreeBSD) -- { -- auto errs = strerror_r(err, buf.ptr, buf.length); -- if (errs == 0) -- cs = buf.ptr; -- else -- return "Socket error " ~ to!string(err); -- } -- else version (NetBSD) -- { -- auto errs = strerror_r(err, buf.ptr, buf.length); -- if (errs == 0) -- cs = buf.ptr; -- else -- return "Socket error " ~ to!string(err); -- } -- else version (DragonFlyBSD) -- { -- auto errs = strerror_r(err, buf.ptr, buf.length); -- if (errs == 0) -- cs = buf.ptr; -- else -- return "Socket error " ~ to!string(err); -- } -- else version (Solaris) -- { -- auto errs = strerror_r(err, buf.ptr, buf.length); -- if (errs == 0) -- cs = buf.ptr; -- else -- return "Socket error " ~ to!string(err); -- } -- else version (CRuntime_Bionic) -+ else - { - auto errs = strerror_r(err, buf.ptr, buf.length); - if (errs == 0) -@@ -211,8 +171,6 @@ string formatSocketError(int err) @trusted - else - return "Socket error " ~ to!string(err); - } -- else -- static assert(0); - - auto len = strlen(cs); - -diff --git a/std/stdio.d b/std/stdio.d -index 16d34f0e94..9f0495d98c 100644 ---- phobos/std/stdio.d -+++ phobos/std/stdio.d -@@ -44,38 +44,38 @@ version (CRuntime_Glibc) - version = GCC_IO; - version = HAS_GETDELIM; - } -- --version (OSX) -+else version (CRuntime_Bionic) - { - version = GENERIC_IO; - version = HAS_GETDELIM; - } -- --version (FreeBSD) -+else version (CRuntime_Musl) - { - version = GENERIC_IO; - version = HAS_GETDELIM; - } - --version (NetBSD) -+version (OSX) - { - version = GENERIC_IO; - version = HAS_GETDELIM; - } -- --version (DragonFlyBSD) -+else version (FreeBSD) - { - version = GENERIC_IO; - version = HAS_GETDELIM; - } -- --version (Solaris) -+else version (NetBSD) - { - version = GENERIC_IO; -- version = NO_GETDELIM; -+ version = HAS_GETDELIM; - } -- --version (CRuntime_Bionic) -+else version (DragonFlyBSD) -+{ -+ version = GENERIC_IO; -+ version = HAS_GETDELIM; -+} -+else version (Solaris) - { - version = GENERIC_IO; - version = NO_GETDELIM; diff --git a/srcpkgs/dmd/template b/srcpkgs/dmd/template index 8bc87b2d9ac..3e3284df2b8 100644 --- a/srcpkgs/dmd/template +++ b/srcpkgs/dmd/template @@ -1,6 +1,6 @@ # Template file for 'dmd' pkgname=dmd -version=2.079.1 +version=2.080.0 revision=1 create_wrksrc=yes makedepends="dmd-bootstrap" @@ -14,10 +14,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="86f125bcc9d1c3d47ed9211b033ebbb38f827a9d37466aa1d91cc1d76b2bb1e8 - 9e943fbf38912ef8f71dd7252c0ca2284a23681c8e61a6ee38b317232b676792 - a8585ef4bbd19d02fab4054619324126985db4fdf4d4751a91bd2e6fb23b5fe9 - ae662ae24def53cb30733dd9ea811c4363a26c9434baab6d0a5d832a92d8af28" +checksum="bef32e69f73ec2fd8482a3649797d85e4740d2c2019b8e03b37524ba58acec92 + e8b856d0927f3600003dddb049f091a2a50c74ad35182ffd1f88d6faf9079d77 + ec24c2bf3705edcdb33879db4f4ee5bab7d226b77920a29f945bd0665c5b5be4 + 0ce8cbde1116dfc0e3f6f3e6ead794a5e6cbefa9483cdd55493e6a3b7e093bc3" conf_files="/etc/dmd.conf" provides="d-compiler-${version}_${revision}" conflicts="dmd-bootstrap"