me
/
guix
Archived
1
0
Fork 0
Code

gnu: ldc: Update to 1.35.0. 

* gnu/packages/dlang.scm (ldc-bootstrap): Update to 1.35.0.
[arguments]: Adjust configure-flags to not build shared libraries.
(ldc)[arguments]: Adjust configure-flags to remove defaults.  Adjust
'patch-paths-in-tests phase for another hardcoded /bin/bash.  Delete
another test.

Change-Id: Ie284a97ecda2689e6ed84a902eff990cfae8c195
Efraim Flashner 2023-12-02 19:08:18 +02:00
parent 6897a6a481
commit 766946d663
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/dlang.scm
View File

@ -149,21 +149,23 @@ to a minimal test case.")
(define ldc-bootstrap (define ldc-bootstrap
(package (package
(name "ldc") (name "ldc")
(version "1.32.2") (version "1.35.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/ldc-developers/ldc/releases" (uri (string-append "https://github.com/ldc-developers/ldc/releases"
"/download/v" version "/ldc-" version "-src.tar.gz")) "/download/v" version "/ldc-" version "-src.tar.gz"))
(sha256 (sha256
(base32 "15fdl7fy1ssjxpyb9g54ac4xzcirycly521whil142ijfkpam95z")))) (base32 "186z4r1d8y4dfpv5cdqgz9al6w7qnfh9l4q9ws9w0xkcf29njabf"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:disallowed-references (,tzdata-for-tests) `(#:disallowed-references (,tzdata-for-tests)
#:tests? #f ;skip in the bootstrap #:tests? #f ;skip in the bootstrap
#:build-type "Release" #:build-type "Release"
#:configure-flags #:configure-flags
(list "-GNinja") (list "-GNinja"
;; see .github/actions/2-build-bootstrap/action.yml
"-DBUILD_SHARED_LIBS=OFF")
#:make-flags ;used as build targets #:make-flags ;used as build targets
(list "all") (list "all")
#:phases #:phases
@ -224,10 +226,9 @@ bootstrapping more recent compilers written in D.")
'(list "all" '(list "all"
;; Also build the test runner binaries. ;; Also build the test runner binaries.
"ldc2-unittest" "all-test-runners")) "ldc2-unittest" "all-test-runners"))
((#:configure-flags flags) ((#:configure-flags _ #~'())
`(,@flags "-DBUILD_SHARED_LIBS=ON" `(list "-GNinja"
"-DLDC_LINK_MANUALLY=OFF" "-DBUILD_SHARED_LIBS=ON"))
"-DLDC_DYNAMIC_COMPILE=OFF"))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'unpack 'fix-compiler-rt-library-discovery (add-after 'unpack 'fix-compiler-rt-library-discovery
@ -257,7 +258,8 @@ bootstrapping more recent compilers written in D.")
"/lib/linux\",\n")))))) "/lib/linux\",\n"))))))
(add-after 'unpack 'patch-paths-in-tests (add-after 'unpack 'patch-paths-in-tests
(lambda _ (lambda _
(substitute* "tests/dmd/Makefile" (substitute* '("tests/dmd/Makefile"
"runtime/druntime/test/profile/Makefile")
(("/bin/bash") (which "bash"))) (("/bin/bash") (which "bash")))
(substitute* "tests/linking/linker_switches.d" (substitute* "tests/linking/linker_switches.d"
(("echo") (which "echo"))) (("echo") (which "echo")))
@ -292,6 +294,8 @@ bootstrapping more recent compilers written in D.")
(substitute* "runtime/druntime/test/exceptions/Makefile" (substitute* "runtime/druntime/test/exceptions/Makefile"
((".*TESTS\\+=rt_trap_exceptions_drt_gdb.*") ((".*TESTS\\+=rt_trap_exceptions_drt_gdb.*")
"")) ""))
;; Unsupported with glibc-2.35.
(delete-file "tests/dmd/compilable/stdcheaders.c")
;; Drop gdb_dflags from the test suite. ;; Drop gdb_dflags from the test suite.
(substitute* "tests/dmd/CMakeLists.txt" (substitute* "tests/dmd/CMakeLists.txt"
(("\\$\\{gdb_dflags\\}") "")) (("\\$\\{gdb_dflags\\}") ""))