diff options
author | Pjotr Prins <pjotr.public12@thebird.nl> | 2018-09-09 17:57:42 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2018-09-10 17:47:52 +0200 |
commit | 633e8aab6990b9eff1f2f0e77d27dc17f163bbc4 (patch) | |
tree | 3c513db836c2e6933208aa418afbd4f26bbcdb5b /gnu/packages/patches | |
parent | f80d6ea251601c63580f63ad5df5ca5c0151dfa0 (diff) | |
download | guix-633e8aab6990b9eff1f2f0e77d27dc17f163bbc4.tar.gz |
gnu: ldc: Update to 1.10.0.
* gnu/packages/ldc.scm (ldc): Update to 1.10.0. [native-inputs]: Switch to LLVM and CLANG. (ldc-bootstrap)[synopsis, description]: Tweak. * gnu/packages/patches/ldc-disable-phobos-tests.patch: New file. * gnu/packages/patches/ldc-1.7.0-disable-phobos-tests.patch: Remove. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/ldc-1.7.0-disable-phobos-tests.patch | 88 | ||||
-rw-r--r-- | gnu/packages/patches/ldc-disable-phobos-tests.patch | 22 |
2 files changed, 22 insertions, 88 deletions
diff --git a/gnu/packages/patches/ldc-1.7.0-disable-phobos-tests.patch b/gnu/packages/patches/ldc-1.7.0-disable-phobos-tests.patch deleted file mode 100644 index ccc136cc76..0000000000 --- a/gnu/packages/patches/ldc-1.7.0-disable-phobos-tests.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/std/path.d b/std/path.d -index a9f0bd8..f47d103 100644 ---- a/std/path.d -+++ b/std/path.d -@@ -4041,7 +4041,7 @@ version(unittest) import std.process : environment; - else version (Android) - { - } -- else -+ else version (HasRoot) - { - assert(expandTilde("~root") == "/root", expandTilde("~root")); - assert(expandTilde("~root/") == "/root/", expandTilde("~root/")); - -diff --git a/std/process.d b/std/process.d -index df83296..d921cdb 100644 ---- a/std/process.d -+++ b/std/process.d -@@ -1171,7 +1171,7 @@ version (Posix) @system unittest - assert(exists(buildPath(directory, "bar"))); - } - --@system unittest // Specifying a bad working directory. -+@system version(skipunittest) unittest // Specifying a bad working directory. - { - import std.exception : assertThrown; - TestScript prog = "/bin/echo"; -diff --git a/std/socket.d b/std/socket.d -index 8a261d5..c1b87b6 100644 ---- a/std/socket.d -+++ b/std/socket.d -@@ -484,7 +484,7 @@ class Protocol - // Skip this test on Android because getprotobyname/number are - // unimplemented in bionic. - version(CRuntime_Bionic) {} else --@safe unittest -+@safe version(hasNetwork) unittest - { - softUnittest({ - Protocol proto = new Protocol; -@@ -804,7 +804,7 @@ class InternetHost - } - - /// --@safe unittest -+@safe version(hasNetwork) unittest - { - InternetHost ih = new InternetHost; - -@@ -959,7 +959,7 @@ AddressInfo[] getAddressInfo(T...)(in char[] node, T options) - return () @trusted { return getAddressInfoImpl(node, service, &hints); }(); - } - --@system unittest -+@system version(hasNetwork) unittest - { - struct Oops - { -@@ -1010,7 +1010,7 @@ private AddressInfo[] getAddressInfoImpl(in char[] node, in char[] service, addr - } - - --@safe unittest -+@safe version(hasNetwork) unittest - { - softUnittest({ - if (getaddrinfoPointer) -diff --git a/std/stdio.d b/std/stdio.d -index 10106a5..4b0590e 100644 ---- a/std/stdio.d -+++ b/std/stdio.d -@@ -1426,8 +1426,7 @@ Removes the lock over the specified file segment. - g.unlock(); - } - -- version(Posix) -- @system unittest -+ @system version(skip) unittest - { - static import std.file; - auto deleteme = testFilename(); -@@ -1483,7 +1482,6 @@ Removes the lock over the specified file segment. - f.unlock(); - } - -- - /** - Writes its arguments in text format to the file. diff --git a/gnu/packages/patches/ldc-disable-phobos-tests.patch b/gnu/packages/patches/ldc-disable-phobos-tests.patch new file mode 100644 index 0000000000..f8a9743d59 --- /dev/null +++ b/gnu/packages/patches/ldc-disable-phobos-tests.patch @@ -0,0 +1,22 @@ +diff --git a/std/socket.d b/std/socket.d +index 111cd17..6d23da9 100644 +--- a/std/socket.d ++++ b/std/socket.d +@@ -448,7 +448,7 @@ class Protocol + // Skip this test on Android because getprotobyname/number are + // unimplemented in bionic. + version(CRuntime_Bionic) {} else +-@safe unittest ++@safe version(hasNetwork) unittest + { + // import std.stdio : writefln; + softUnittest({ +@@ -770,7 +770,7 @@ class InternetHost + } + + /// +-@safe unittest ++@safe version(hasNetwork) unittest + { + InternetHost ih = new InternetHost; + |