me/guix
Archived
1
0
Fork 0
Code Activity

gnu: ldc-bootstrap: Update to 0.17.6.

Browse source 
* gnu/packages/dlang.scm (ldc-bootstrap): Update to 0.17.6.
[arguments]: Remove 'patch-dmd2 phase. Enable one test from
'patch-phobos.
[native-inputs]: Replace llvm-3.8, clang-3.8 with llvm-6, clang-6.
This commit is contained in:
Efraim Flashner 2021-01-25 19:22:00 +02:00
parent 3f0af15131
commit 13ff47c02c
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gnu/packages/dlang.scm
View file

@ -5,6 +5,7 @@
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org> ;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -83,7 +84,7 @@ and freshness without requiring additional information from the user.")
(define-public ldc-bootstrap (define-public ldc-bootstrap
(package (package
(name "ldc") (name "ldc")
(version "0.17.4") (version "0.17.6")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -92,7 +93,7 @@ and freshness without requiring additional information from the user.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0nnrjavfmpfp7bib04isqlxvyzh6mlvsdan0gxysdz96hlg4hcq8")))) (base32 "1q6hm4fkrcwys83x0p4kfg9xrc1b9g2qicqif2zy5z4nsfsb5vgs"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(supported-systems '("x86_64-linux" "i686-linux" "armhf-linux")) (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux"))
(properties (properties
@ -117,14 +118,6 @@ and freshness without requiring additional information from the user.")
(unpack "druntime-src" "runtime/druntime") (unpack "druntime-src" "runtime/druntime")
(unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite") (unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite")
#t))) #t)))
(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 (add-after 'unpack-submodule-sources 'patch-phobos
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "runtime/phobos/std/process.d" (substitute* "runtime/phobos/std/process.d"
@ -137,8 +130,6 @@ and freshness without requiring additional information from the user.")
"(tzName == \"+VERSION\" || std.algorithm.endsWith(tzName, \"/leapseconds\"))")) "(tzName == \"+VERSION\" || std.algorithm.endsWith(tzName, \"/leapseconds\"))"))
(substitute* "tests/d2/dmd-testsuite/Makefile" (substitute* "tests/d2/dmd-testsuite/Makefile"
(("/bin/bash") (which "bash"))) (("/bin/bash") (which "bash")))
;; FIXME: this test cannot be linked.
(delete-file "tests/d2/dmd-testsuite/runnable/cppa.d")
;; the following two tests fail on i686 ;; the following two tests fail on i686
(for-each delete-file '("tests/ir/attributes.d" "tests/ir/align.d"))))))) (for-each delete-file '("tests/ir/attributes.d" "tests/ir/align.d")))))))
(inputs (inputs
@ -147,8 +138,8 @@ and freshness without requiring additional information from the user.")
("tzdata" ,tzdata) ("tzdata" ,tzdata)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("llvm" ,llvm-3.8) `(("llvm" ,llvm-6)
("clang" ,clang-3.8) ("clang" ,clang-6)
("python-lit" ,python-lit) ("python-lit" ,python-lit)
("python-wrapper" ,python-wrapper) ("python-wrapper" ,python-wrapper)
("unzip" ,unzip) ("unzip" ,unzip)
@ -160,7 +151,7 @@ and freshness without requiring additional information from the user.")
(commit (string-append "ldc-v" version)))) (commit (string-append "ldc-v" version))))
(file-name (git-file-name "phobos" version)) (file-name (git-file-name "phobos" version))
(sha256 (sha256
(base32 "0i7gh99w4mi0hdv16261jcdiqyv1nkjdcwy9prw32s0lvplx8fdy")) (base32 "15jzs38wanks2jfp2izzl7zqrp4c8ai54ppsgm8ws86p3sbbkmj8"))
(patches (search-patches "ldc-bootstrap-disable-tests.patch")))) (patches (search-patches "ldc-bootstrap-disable-tests.patch"))))
("druntime-src" ("druntime-src"
,(origin ,(origin
@ -170,7 +161,7 @@ and freshness without requiring additional information from the user.")
(commit (string-append "ldc-v" version)))) (commit (string-append "ldc-v" version))))
(file-name (git-file-name "druntime" version)) (file-name (git-file-name "druntime" version))
(sha256 (sha256
(base32 "0alabm3bbvs94msvxz5psiwk4f51cw9h82z1p5hhsnf8ja6d0am7")))) (base32 "00wr2kiggwnd8h7by51fhj1xc65hv1ysip5gbgdbkfar58p2d0bb"))))
("dmd-testsuite-src" ("dmd-testsuite-src"
,(origin ,(origin
(method git-fetch) (method git-fetch)
@ -179,7 +170,7 @@ and freshness without requiring additional information from the user.")
(commit (string-append "ldc-v" version)))) (commit (string-append "ldc-v" version))))
(file-name (git-file-name "dmd-testsuite" version)) (file-name (git-file-name "dmd-testsuite" version))
(sha256 (sha256
(base32 "05qr4cgb4scfqzbw1l5pk72kil074mvj9d55b165ljyr51sgwgbl")))))) (base32 "1d1c0979wbippldrkjf7szyj4n87hxz8dwqg1r5b3aai37g9kcky"))))))
(home-page "http://wiki.dlang.org/LDC") (home-page "http://wiki.dlang.org/LDC")
(synopsis "LLVM-based compiler for the D programming language") (synopsis "LLVM-based compiler for the D programming language")
(description (description