From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: Re: [PATCH v8] gnu: Update ldc to 0.17.1. Date: Wed, 14 Sep 2016 16:25:38 +0300 Message-ID: <20160914132537.GD31892@macbook42.flashner.co.il> References: <20160913200139.17708-1-dannym@scratchpost.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="bajzpZikUji1w+G9" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:47479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkACG-00082l-8s for guix-devel@gnu.org; Wed, 14 Sep 2016 09:25:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bkACB-0000t8-Fh for guix-devel@gnu.org; Wed, 14 Sep 2016 09:25:51 -0400 Received: from flashner.co.il ([178.62.234.194]:39715) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkACB-0000r9-5n for guix-devel@gnu.org; Wed, 14 Sep 2016 09:25:47 -0400 Content-Disposition: inline In-Reply-To: <20160913200139.17708-1-dannym@scratchpost.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Danny Milosavljevic Cc: guix-devel@gnu.org --bajzpZikUji1w+G9 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Sep 13, 2016 at 10:01:39PM +0200, Danny Milosavljevic wrote: > gnu: Update ldc to 0.17.1. >=20 > * gnu/packages/ldc.scm (ldc): Changed. > * gnu/packages/patches/ldc-0.17.1-disable-tests.patch: New patch. > --- > gnu/packages/ldc.scm | 25 ++++--- > .../patches/ldc-0.17.1-disable-tests.patch | 86 ++++++++++++++++= ++++++ > 2 files changed, 101 insertions(+), 10 deletions(-) > create mode 100644 gnu/packages/patches/ldc-0.17.1-disable-tests.patch >=20 > diff --git a/gnu/packages/ldc.scm b/gnu/packages/ldc.scm > index 560fa49..88f3443 100644 > --- a/gnu/packages/ldc.scm > +++ b/gnu/packages/ldc.scm > @@ -29,6 +29,7 @@ > #:use-module (gnu packages compression) > #:use-module (gnu packages libedit) > #:use-module (gnu packages llvm) > + #:use-module (gnu packages python) > #:use-module (gnu packages textutils) > #:use-module (gnu packages zip)) > =20 > @@ -76,7 +77,7 @@ and freshness without requiring additional information = =66rom the user.") > (define-public ldc > (package > (name "ldc") > - (version "0.16.1") > + (version "0.17.1") > (source (origin > (method url-fetch) > (uri (string-append > @@ -85,10 +86,9 @@ and freshness without requiring additional information= from the user.") > (file-name (string-append name "-" version ".tar.gz")) > (sha256 > (base32 > - "1jvilxx0rpqmkbja4m69fhd5g09697xq7vyqp2hz4hvxmmmv4j40"))= )) > + "0rwggnbr60jbajfdw11kx058llmwljiss8rrv8df07vaygiv845i"))= )) > (build-system cmake-build-system) > - ;; LDC currently only supports the x86_64 and i686 architectures. > - (supported-systems '("x86_64-linux" "i686-linux")) > + (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux")) > (arguments > `(#:phases > (modify-phases %standard-phases > @@ -105,10 +105,13 @@ and freshness without requiring additional informat= ion from the user.") > (add-after 'unpack-submodule-sources 'patch-dmd2 > (lambda* (#:key inputs #:allow-other-keys) > (substitute* "dmd2/root/port.c" > + (("#include ") "#include ") > ((" ::isnan") " isnan") > ((" ::isinf") " isinf") > - (("#undef isnan") "") > - (("#undef isinf") "")) > + (("#undef isnan") "#undef isnan > +using namespace std;") > + (("#undef isinf") "#undef isinf > +using namespace std;")) > #t)) > (add-after 'unpack-submodule-sources 'patch-phobos > (lambda* (#:key inputs #:allow-other-keys) > @@ -130,6 +133,8 @@ and freshness without requiring additional informatio= n from the user.") > `(("llvm" ,llvm-3.7) > ("clang" ,clang-3.7) > ("unzip" ,unzip) > + ("python-wrapper" ,python-wrapper) ; Needed for running tests > + ("python-lit" ,python-lit) ; Needed for running tests > ("phobos-src" > ,(origin > (method url-fetch) > @@ -138,8 +143,8 @@ and freshness without requiring additional informatio= n from the user.") > version ".tar.gz")) > (sha256 > (base32 > - "0sgdj0536c4nb118yiw1f8lqy5d3g3lpg9l99l165lk9xy45l9z4")) > - (patches (search-patches "ldc-disable-tests.patch")))) > + "17nb1yvqblqj3q42c8nlnwvy823fw6kna28n2b48j4m6kd2w0nan")) > + (patches (search-patches "ldc-0.17.1-disable-tests.patch")))) > ("druntime-src" > ,(origin > (method url-fetch) > @@ -148,7 +153,7 @@ and freshness without requiring additional informatio= n from the user.") > version ".tar.gz")) > (sha256 > (base32 > - "0z4mkyddx6c4sy1vqgqvavz55083dsxws681qkh93jh1rpby9yg6")))) > + "129j7mfd0vnzaw7i6hr5waxm5cb0qcm8gyawy2xy5avlv8hrw5m4")))) > ("dmd-testsuite-src" > ,(origin > (method url-fetch) > @@ -157,7 +162,7 @@ and freshness without requiring additional informatio= n from the user.") > version ".tar.gz")) > (sha256 > (base32 > - "0yc6miidzgl9k33ygk7xcppmfd6kivqj02cvv4fmkbs3qz4yy3z1")))))) > + "18h16lwwmr3k9dh7mcip17il72mz680wnygv9d0mdnivczn80zyv")))))) > (home-page "http://wiki.dlang.org/LDC") > (synopsis "LLVM compiler for the D programming language") > (description > diff --git a/gnu/packages/patches/ldc-0.17.1-disable-tests.patch b/gnu/pa= ckages/patches/ldc-0.17.1-disable-tests.patch > new file mode 100644 > index 0000000..b213894 > --- /dev/null > +++ b/gnu/packages/patches/ldc-0.17.1-disable-tests.patch > @@ -0,0 +1,86 @@ > +Adapted from "ldc-disable-tests.patch" from Guix. > +diff -ru a/std/datetime.d b/std/datetime.d > +--- a/std/datetime.d 2016-08-02 23:56:13.969292202 +0200 > ++++ b/std/datetime.d 2016-08-02 23:57:39.078408313 +0200 > +@@ -28080,9 +28080,6 @@ > + import std.algorithm : sort; > + import std.range : retro; > + import std.format : format; > +- > +- name =3D strip(name); > +- > + enforce(tzDatabaseDir.exists(), new DateTimeException(format("D= irectory %s does not exist.", tzDatabaseDir))); > + enforce(tzDatabaseDir.isDir, new DateTimeException(format("%s i= s not a directory.", tzDatabaseDir))); > +=20 > +@@ -28094,7 +28091,10 @@ > + immutable file =3D buildNormalizedPath(tzDatabaseDir, tzFil= ename); > + } > + else > +- immutable file =3D buildNormalizedPath(tzDatabaseDir, name); > ++ { > ++ auto filename =3D "./" ~ strip(name); // make sure the pref= ix is not stripped > ++ immutable file =3D buildNormalizedPath(tzDatabaseDir, filen= ame); > ++ } > +=20 > + enforce(file.exists(), new DateTimeException(format("File %s do= es not exist.", file))); > + enforce(file.isFile, new DateTimeException(format("%s is not a = file.", file))); > +diff -ru a/std/path.d b/std/path.d > +--- a/std/path.d 2016-08-02 23:56:03.781158908 +0200 > ++++ b/std/path.d 2016-08-02 23:54:06.111624406 +0200 > +@@ -3724,8 +3724,8 @@ > + } > + else > + { > +- assert(expandTilde("~root") =3D=3D "/root", expandTilde("~r= oot")); > +- assert(expandTilde("~root/") =3D=3D "/root/", expandTilde("= ~root/")); > ++ //assert(expandTilde("~root") =3D=3D "/root", expandTilde("= ~root")); > ++ //assert(expandTilde("~root/") =3D=3D "/root/", expandTilde= ("~root/")); > + } > + assert(expandTilde("~Idontexist/hey") =3D=3D "~Idontexist/hey"); > + } > +diff -ru a/std/socket.d b/std/socket.d > +--- a/std/socket.d 2016-08-02 23:56:22.881408857 +0200 > ++++ b/std/socket.d 2016-08-03 10:09:44.761019447 +0200 > +@@ -501,18 +501,19 @@ > + version(CRuntime_Bionic) {} else > + unittest > + { > +- softUnittest({ > ++ pragma(msg, "test disabled on GNU Guix"); > ++ //softUnittest({ > + Protocol proto =3D new Protocol; > +- assert(proto.getProtocolByType(ProtocolType.TCP)); > ++ //assert(proto.getProtocolByType(ProtocolType.TCP)); > + //writeln("About protocol TCP:"); > + //writefln("\tName: %s", proto.name); > + // foreach(string s; proto.aliases) > + // { > + // writefln("\tAlias: %s", s); > + // } > +- assert(proto.name =3D=3D "tcp"); > +- assert(proto.aliases.length =3D=3D 1 && proto.aliases[0] =3D=3D= "TCP"); > +- }); > ++ //assert(proto.name =3D=3D "tcp"); > ++ //assert(proto.aliases.length =3D=3D 1 && proto.aliases[0] =3D= =3D "TCP"); > ++ //}); > + } > +=20 > +=20 > +@@ -842,6 +843,8 @@ > +=20 > + unittest > + { > ++ pragma(msg, "test disabled on GNU Guix"); > ++ /* > + InternetHost ih =3D new InternetHost; > +=20 > + ih.getHostByAddr(0x7F_00_00_01); > +@@ -872,6 +875,7 @@ > + // writefln("aliases[%d] =3D %s", i, s); > + // } > + }); > ++ */ > + } > +=20 > +=20 > +Only in b/std: socket.d.orig With this patch I got: The following tests FAILED: 238 - std.datetime (Failed) 296 - std.regex.internal.tests (Failed) 568 - std.datetime-debug (Failed) 626 - std.regex.internal.tests-debug (Failed) 670 - dmd-testsuite-debug (Failed) --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --bajzpZikUji1w+G9 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJX2U/NAAoJEPTB05F+rO6TcjYQAINm0e+EdruJFnW/T6eWnlns k/Cw6isRGXvDE1kDdwz626pNS9OnDw1GjC7KB3IIlrdnXQ9Dk/qpTjj00UfVwqMv Pp7zdnuWFHEydeZFkcu6ooQ1yVTDEYYbXOFpheGE9RBitnDzahyum28ZDnF5vEbl YGVyd5UPkCehN4YKXmVFAjuHpeccxzLmpwKBS/K2EfITQJ+qETIoKeDyffmPpTpz 6TNQGRDYV34xMewAHLIcLNfNc+co8WqSprPkdLXFbpbfWQbulDnetc/kCzqj4bSb RJ8CsM66oFoQkL6cHf6J8q8yhr/wUr9tO9hhsb/A3BT13JQe0FISokuaY8Schwkj yYYDiLaghMFauydw7CJpJL0gfPPbJGnpppWeoCtnfUscfbN+t7M6tYO3yoDMjxFI C6jfrMEbhfP13/s1FbE06bXrA7gZ14/Me7p0Srhwy3SZwNrrA408hOOsepFq1ug9 k+0D+eW/iHIwC4dzqSiiQi8l4DZAkaf9/XHFuaAjZ5qyN9OE8LtaE2bYph8kki94 Qy+0wGrNYYBeDaFT74lpcgXsSKZzcU5os+EUWl+dpfafxBT7wvGQYBBcl6lo/u4N SoY+2hq3RKP2YaHwGVtqRGpiVsRw64ykaH25zZ9vzUHPIugQqlXAHGCpOULJE+Bv eNoilK3IBM8R7GNsMANz =/2VQ -----END PGP SIGNATURE----- --bajzpZikUji1w+G9--