From: Danny Milosavljevic <dannym@scratchpost.org>
To: guix-devel@gnu.org
Subject: [PATCH v4 2/3] gnu: Make ldc work again
Date: Tue, 13 Sep 2016 12:30:41 +0200 [thread overview]
Message-ID: <20160913103042.7302-3-dannym@scratchpost.org> (raw)
In-Reply-To: <20160913103042.7302-1-dannym@scratchpost.org>
[-- Attachment #1: Type: text/plain, Size: 208 bytes --]
* gnu/packages/ldc.scm (ldc): Added substitution. Added zlib input. Fix llvm and clang inputs to 3.7.
---
gnu/packages/ldc.scm | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-Make-ldc-work-again-patch-isnan-isinf.patch --]
[-- Type: text/x-patch; name="0002-gnu-Make-ldc-work-again-patch-isnan-isinf.patch", Size: 1714 bytes --]
diff --git a/gnu/packages/ldc.scm b/gnu/packages/ldc.scm
index 1709f59..560fa49 100644
--- a/gnu/packages/ldc.scm
+++ b/gnu/packages/ldc.scm
@@ -26,6 +26,7 @@
#:use-module (guix build-system cmake)
#:use-module (gnu packages)
#:use-module (gnu packages base)
+ #:use-module (gnu packages compression)
#:use-module (gnu packages libedit)
#:use-module (gnu packages llvm)
#:use-module (gnu packages textutils)
@@ -101,6 +102,14 @@ and freshness without requiring additional information from the user.")
(and (unpack "phobos-src" "runtime/phobos")
(unpack "druntime-src" "runtime/druntime")
(unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite")))))
+ (add-after 'unpack-submodule-sources 'patch-dmd2
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "dmd2/root/port.c"
+ ((" ::isnan") " isnan")
+ ((" ::isinf") " isinf")
+ (("#undef isnan") "")
+ (("#undef isinf") ""))
+ #t))
(add-after 'unpack-submodule-sources 'patch-phobos
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "runtime/phobos/std/process.d"
@@ -115,10 +124,11 @@ and freshness without requiring additional information from the user.")
(inputs
`(("libconfig" ,libconfig)
("libedit" ,libedit)
- ("tzdata" ,tzdata)))
+ ("tzdata" ,tzdata)
+ ("zlib" ,zlib)))
(native-inputs
- `(("llvm" ,llvm)
- ("clang" ,clang)
+ `(("llvm" ,llvm-3.7)
+ ("clang" ,clang-3.7)
("unzip" ,unzip)
("phobos-src"
,(origin
next prev parent reply other threads:[~2016-09-13 10:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-13 10:30 [PATCH v4 0/3] Fix ldc Danny Milosavljevic
2016-09-13 10:30 ` [PATCH v4 1/3] gnu: Add python-lit, python2-lit Danny Milosavljevic
2016-09-13 16:42 ` Leo Famulari
2016-09-13 10:30 ` Danny Milosavljevic [this message]
2016-09-13 16:53 ` [PATCH v4 2/3] gnu: Make ldc work again Leo Famulari
2016-09-13 18:09 ` Leo Famulari
2016-09-13 19:20 ` Ricardo Wurmus
2016-09-13 19:25 ` Leo Famulari
2016-09-13 20:01 ` Roel Janssen
2016-09-13 19:05 ` Roel Janssen
2016-09-13 10:30 ` [PATCH v4 3/3] gnu: Update ldc to 0.17.1 Danny Milosavljevic
2016-09-13 16:55 ` Leo Famulari
2016-09-13 19:44 ` Danny Milosavljevic
2016-09-13 19:25 ` Efraim Flashner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160913103042.7302-3-dannym@scratchpost.org \
--to=dannym@scratchpost.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.