From mboxrd@z Thu Jan 1 00:00:00 1970 From: Danny Milosavljevic Subject: [PATCH v4 2/3] gnu: Make ldc work again Date: Tue, 13 Sep 2016 12:30:41 +0200 Message-ID: <20160913103042.7302-3-dannym@scratchpost.org> References: <20160913103042.7302-1-dannym@scratchpost.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2.9.1" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjkzO-0002eT-Uv for guix-devel@gnu.org; Tue, 13 Sep 2016 06:30:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bjkzM-0004fu-Gc for guix-devel@gnu.org; Tue, 13 Sep 2016 06:30:54 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:34355) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjkzM-0004fn-9r for guix-devel@gnu.org; Tue, 13 Sep 2016 06:30:52 -0400 In-Reply-To: <20160913103042.7302-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: guix-devel@gnu.org This is a multi-part message in MIME format. --------------2.9.1 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: quoted-printable * gnu/packages/ldc.scm (ldc): Added substitution. Added zlib input. Fix l= lvm and clang inputs to 3.7. --- gnu/packages/ldc.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) --------------2.9.1 Content-Type: text/x-patch; name="0002-gnu-Make-ldc-work-again-patch-isnan-isinf.patch" Content-Disposition: attachment; filename="0002-gnu-Make-ldc-work-again-patch-isnan-isinf.patch" Content-Transfer-Encoding: quoted-printable 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 informati= on 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 informat= ion 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 --------------2.9.1--