unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH] Add LDC.
@ 2015-12-29 11:18 Roel Janssen
  2015-12-29 15:02 ` Ricardo Wurmus
  2015-12-29 15:42 ` Ricardo Wurmus
  0 siblings, 2 replies; 11+ messages in thread
From: Roel Janssen @ 2015-12-29 11:18 UTC (permalink / raw)
  To: guix-devel

[-- Attachment #1: 0001-gnu-add-LDC.patch --]
[-- Type: text/x-patch, Size: 11017 bytes --]

From 02ac3c5d71e16dc0851018e04aec817e86c8597c Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Tue, 29 Dec 2015 12:06:25 +0100
Subject: [PATCH] gnu: add LDC.

* gnu/packages/dlanguage.scm (ldc): New variable.
* gnu/packages/patches/ldc-disable-tests.patch: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add (gnu packages dlanguage).
* gnu-system.am (dist_patch_DATA): Add patch file.
---
 gnu-system.am                                |   2 +
 gnu/packages/dlanguage.scm                   | 134 +++++++++++++++++++++++++++
 gnu/packages/patches/ldc-disable-tests.patch |  90 ++++++++++++++++++
 3 files changed, 226 insertions(+)
 create mode 100644 gnu/packages/dlanguage.scm
 create mode 100644 gnu/packages/patches/ldc-disable-tests.patch

diff --git a/gnu-system.am b/gnu-system.am
index e1874fa..1ede2ac 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -175,6 +175,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/key-mon.scm			\
   gnu/packages/kodi.scm				\
   gnu/packages/language.scm			\
+  gnu/packages/dlanguage.scm			\
   gnu/packages/less.scm				\
   gnu/packages/lesstif.scm			\
   gnu/packages/libcanberra.scm			\
@@ -522,6 +523,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/jbig2dec-ignore-testtest.patch		\
   gnu/packages/patches/julia-0.3.10-fix-empty-array.patch	\
   gnu/packages/patches/kmod-module-directory.patch		\
+  gnu/packages/patches/ldc-disable-tests.patch			\
   gnu/packages/patches/lftp-dont-save-unknown-host-fingerprint.patch \
   gnu/packages/patches/liba52-enable-pic.patch			\
   gnu/packages/patches/liba52-link-with-libm.patch		\
diff --git a/gnu/packages/dlanguage.scm b/gnu/packages/dlanguage.scm
new file mode 100644
index 0000000..a90519c
--- /dev/null
+++ b/gnu/packages/dlanguage.scm
@@ -0,0 +1,134 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Roel Janssen <roel@gnu.org>
+;;; Copyright © 2015 Pjotr Prins <pjotr.guix@thebird.nl>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages dlanguage)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system cmake)
+  #:use-module (gnu packages textutils)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages libedit)
+  #:use-module (gnu packages llvm)
+  #:use-module (gnu packages zip)
+  #:use-module (guix git-download))
+
+(define-public ldc
+  (package
+    (name "ldc")
+    (version "0.16.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/ldc-developers/ldc/archive/v"
+                    version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1jvilxx0rpqmkbja4m69fhd5g09697xq7vyqp2hz4hvxmmmv4j40"))))
+    (build-system cmake-build-system)
+    (supported-systems '("x86_64-linux" "i686-linux"))
+    (arguments
+     `(#:tests? #t
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'unpack-phobos-source
+                    (lambda* (#:key source inputs #:allow-other-keys)
+                      (with-directory-excursion "runtime/phobos"
+                        (copy-file (assoc-ref inputs "phobos-src")
+                                   "phobos-src.tar")
+                        (zero? (system* "tar" "xvf" "phobos-src.tar"
+                                        "--strip-components=1")))))
+         (add-after 'unpack 'unpack-druntime-source
+                    (lambda* (#:key source inputs #:allow-other-keys)
+                      (with-directory-excursion "runtime/druntime"
+                        (copy-file (assoc-ref inputs "druntime-src")
+                                   "druntime-src.tar.gz")
+                        (zero? (system* "tar" "xvzf" "druntime-src.tar.gz"
+                                        "--strip-components=1")))))
+         (add-after 'unpack 'unpack-dmd-testsuite-source
+                    (lambda* (#:key source inputs #:allow-other-keys)
+                      (with-directory-excursion "tests/d2/dmd-testsuite"
+                        (copy-file (assoc-ref inputs "dmd-testsuite-src")
+                                   "dmd-testsuite-src.tar.gz")
+                        (zero? (system* "tar" "xvzf" "dmd-testsuite-src.tar.gz"
+                                        "--strip-components=1")))))
+         (add-after
+          'unpack-phobos-source 'patch-phobos
+          (lambda* (#:key source inputs #:allow-other-keys)
+            (substitute* "runtime/phobos/std/process.d"
+              (("/bin/sh") (which "sh"))
+              (("echo") (which "echo")))
+            (substitute* "runtime/phobos/std/datetime.d"
+              (("/usr/share/zoneinfo/") (string-append
+                                         (assoc-ref inputs "tzdata")
+                                         "/share/zoneinfo")))
+            #t))
+         (add-after
+          'unpack-dmd-testsuite-source 'patch-dmd-testsuite
+          (lambda _
+            (substitute* "tests/d2/dmd-testsuite/Makefile"
+              (("/bin/bash") (which "bash")))
+            #t)))))
+    (inputs
+     `(("libconfig" ,libconfig)
+       ("libedit" ,libedit)
+       ("tzdata" ,tzdata)))  ;; needed for tests
+    (native-inputs
+     `(("llvm" ,llvm)
+       ("clang" ,clang)
+       ("unzip" ,unzip) ;; needed for tests
+       ("phobos-src"
+        ,(origin
+          (method url-fetch)
+          (uri (string-append
+                "https://github.com/ldc-developers/phobos/archive/ldc-v"
+                version ".tar.gz"))
+          (sha256
+           (base32
+            "0sgdj0536c4nb118yiw1f8lqy5d3g3lpg9l99l165lk9xy45l9z4"))
+          (patches (list (search-patch "ldc-disable-tests.patch")))))
+       ("druntime-src"
+        ,(origin
+          (method url-fetch)
+          (uri (string-append
+                "https://github.com/ldc-developers/druntime/archive/ldc-v"
+                version ".tar.gz"))
+          (sha256
+           (base32
+            "0z4mkyddx6c4sy1vqgqvavz55083dsxws681qkh93jh1rpby9yg6"))))
+       ("dmd-testsuite-src"
+        ,(origin
+          (method url-fetch)
+          (uri (string-append
+                "https://github.com/ldc-developers/dmd-testsuite/archive/ldc-v"
+                version ".tar.gz"))
+          (sha256
+           (base32
+            "0yc6miidzgl9k33ygk7xcppmfd6kivqj02cvv4fmkbs3qz4yy3z1"))))))
+    (home-page "https://github.com/ldc-developers/ldc")
+    (synopsis "LLVM compiler for the D programming language")
+    (description
+     "LDC is a compiler for the D programming Language.  It is based on the
+latest DMD frontend and uses LLVM as backend.  LLVM provides a fast and modern
+backend for high quality code generation.  LDC is released under a BSD license
+with exceptions for the DMD frontend and code from GDC.  The development takes
+place mostly on x86-32 and x86-64 Linux and that is where LDC works best.")
+    (license license:bsd-3)))
diff --git a/gnu/packages/patches/ldc-disable-tests.patch b/gnu/packages/patches/ldc-disable-tests.patch
new file mode 100644
index 0000000..42e394d
--- /dev/null
+++ b/gnu/packages/patches/ldc-disable-tests.patch
@@ -0,0 +1,90 @@
+This patch fixes a failing unit test by feeding buildNormalizedPath to the
+tzdata properly. Three other tests are disables, one assumes /root and the
+two others use networking. Not bad out of almost 700 tests!
+
+by Pjotr Prins <pjotr.guix@thebird.nl>
+
+diff --git a/std/datetime.d b/std/datetime.d
+index 8e4ed3b..6c15bc5 100644
+--- a/std/datetime.d
++++ b/std/datetime.d
+@@ -28018,6 +28018,7 @@ public:
+             The default directory where the TZ Database files are. It's empty
+             for Windows, since Windows doesn't have them.
+           +/
++          
+         enum defaultTZDatabaseDir = "/usr/share/zoneinfo/";
+     }
+     else version(Windows)
+@@ -28069,14 +28070,13 @@ assert(tz.dstName == "PDT");
+         import std.range : retro;
+         import std.format : format;
+ 
+-        name = strip(name);
+-
+         enforce(tzDatabaseDir.exists(), new DateTimeException(format("Directory %s does not exist.", tzDatabaseDir)));
+         enforce(tzDatabaseDir.isDir, new DateTimeException(format("%s is not a directory.", tzDatabaseDir)));
+ 
+-        immutable file = buildNormalizedPath(tzDatabaseDir, name);
++        auto filename = "./" ~ strip(name); // make sure the prefix is not stripped
++        immutable file = buildNormalizedPath(tzDatabaseDir, filename);
+ 
+-        enforce(file.exists(), new DateTimeException(format("File %s does not exist.", file)));
++        enforce(file.exists(), new DateTimeException(format("File %s does not exist in %s.", file, tzDatabaseDir)));
+         enforce(file.isFile, new DateTimeException(format("%s is not a file.", file)));
+ 
+         auto tzFile = File(file);
+diff --git a/std/path.d b/std/path.d
+index 254d8f0..b0fc04d 100644
+--- a/std/path.d
++++ b/std/path.d
+@@ -3080,8 +3080,11 @@ unittest
+         }
+         else
+         {
++            pragma(msg, "test disabled on GNU Guix");
++/*
+             assert(expandTilde("~root") == "/root", expandTilde("~root"));
+             assert(expandTilde("~root/") == "/root/", expandTilde("~root/"));
++*/
+         }
+         assert(expandTilde("~Idontexist/hey") == "~Idontexist/hey");
+     }
+diff --git a/std/socket.d b/std/socket.d
+index b85d1c9..7fbf346 100644
+--- a/std/socket.d
++++ b/std/socket.d
+@@ -517,6 +517,8 @@ class Protocol
+ 
+ unittest
+ {
++    pragma(msg, "test disabled on GNU Guix");
++/*
+     // getprotobyname,number are unimplemented on Android
+     softUnittest({
+         Protocol proto = new Protocol;
+@@ -530,6 +532,7 @@ unittest
+         assert(proto.name == "tcp");
+         assert(proto.aliases.length == 1 && proto.aliases[0] == "TCP");
+     });
++*/
+ }
+ 
+ 
+@@ -859,6 +862,8 @@ class InternetHost
+ 
+ unittest
+ {
++    pragma(msg, "test disabled on GNU Guix");
++    /*
+     InternetHost ih = new InternetHost;
+ 
+     ih.getHostByAddr(0x7F_00_00_01);
+@@ -889,6 +894,7 @@ unittest
+         //      writefln("aliases[%d] = %s", i, s);
+         // }
+     });
++    */
+ }
+ 
+ 
-- 
2.5.0


[-- Attachment #2: Type: text/plain, Size: 350 bytes --]

Dear list,

Here is a patch to add the LLVM-based D compiler.  The developers split
the source code in "submodules".  Since these submodules are specific to
LDC, they are described in a single package.

I tried to conform to all style/syntax "rules", so please let me know
when some formatting is wrong.

Thank you for your time.

Kind regards,
Roel

^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2016-02-29  9:58 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-29 11:18 [PATCH] Add LDC Roel Janssen
2015-12-29 15:02 ` Ricardo Wurmus
2015-12-29 15:37   ` Pjotr Prins
2016-01-04 14:23   ` Roel Janssen
2016-01-05 10:06     ` Ricardo Wurmus
2016-01-05 14:48       ` Roel Janssen
2016-01-05 15:22         ` Ricardo Wurmus
2016-01-05 18:46           ` Roel Janssen
2016-02-27  6:20         ` Pjotr Prins
2016-02-29  9:58           ` Ludovic Courtès
2015-12-29 15:42 ` Ricardo Wurmus

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).