From: Hilton Chain via Guix-patches via <guix-patches@gnu.org>
To: 66723@debbugs.gnu.org
Cc: Hilton Chain <hako@ultrarare.space>
Subject: [bug#66723] [PATCH 2/3] gnu: zig-0.9: Use gexp.
Date: Tue, 24 Oct 2023 16:34:02 +0800 [thread overview]
Message-ID: <55d3d44464c9b3df92a179c117669bd071066c05.1698134803.git.hako@ultrarare.space> (raw)
In-Reply-To: <cover.1698134803.git.hako@ultrarare.space>
* gnu/packages/zig.scm (zig-0.9)[arguments]: Use gexp.
Change-Id: I38c856320ace6d960ae342f5de164ca6c3f449c0
---
gnu/packages/zig.scm | 95 ++++++++++++++++++++++----------------------
1 file changed, 48 insertions(+), 47 deletions(-)
diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm
index 882e5426dc..bc3e1c019a 100644
--- a/gnu/packages/zig.scm
+++ b/gnu/packages/zig.scm
@@ -147,52 +147,53 @@ (define-public zig-0.9
(native-inputs
(list llvm-13))
(arguments
- `(#:configure-flags
- (list ,@(if (%current-target-system)
- (string-append "-DZIG_TARGET_TRIPLE="
- (%current-target-system))
- '()))
- #:out-of-source? #f ; for tests
- ;; There are too many unclear test failures.
- #:tests? ,(not (or (target-riscv64?)
- (%current-target-system)))
- #:phases
- (modify-phases %standard-phases
- (add-after 'configure 'set-cache-dir
- (lambda _
- ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'.
- (setenv "ZIG_GLOBAL_CACHE_DIR"
- (string-append (getcwd) "/zig-cache"))))
- ,@(if (target-riscv64?)
- ;; It is unclear why all these tests fail to build.
- `((add-after 'unpack 'adjust-tests
- (lambda _
- (substitute* "build.zig"
- ((".*addRuntimeSafetyTests.*") "")
- ((".*addRunTranslatedCTests.*") ""))
- (substitute* "test/standalone.zig"
- ;; These tests fail to build on riscv64-linux.
- ;; They both contain 'exe.linkSystemLibrary("c");'
- ((".*shared_library.*") "")
- ((".*mix_o_files.*") "")
- ;; ld.lld: error: undefined symbol: __tls_get_addr
- ;; Is this symbol x86 only in glibc?
- ((".*link_static_lib_as_system_lib.*") "")))))
- '())
- (delete 'check)
- (add-after 'install 'check
- (lambda* (#:key outputs tests? #:allow-other-keys)
- (when tests?
- (invoke (string-append (assoc-ref outputs "out") "/bin/zig")
- ;; Testing the standard library takes >7.5GB RAM, and
- ;; will fail if it is OOM-killed. The 'test-toolchain'
- ;; target skips standard library and doc tests.
- "build" "test-toolchain"
- ;; Stage 2 is experimental, not what we run with `zig',
- ;; and stage 2 tests require a lot of RAM.
- "-Dskip-stage2-tests"
- ;; Non-native tests try to link and execute non-native
- ;; binaries.
- "-Dskip-non-native")))))))))
+ (list
+ #:configure-flags
+ #~(list #$@(if (%current-target-system)
+ (list (string-append "-DZIG_TARGET_TRIPLE="
+ (%current-target-system)))
+ '()))
+ #:out-of-source? #f ; for tests
+ ;; There are too many unclear test failures.
+ #:tests? (not (or (target-riscv64?)
+ (%current-target-system)))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'configure 'set-cache-dir
+ (lambda _
+ ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'.
+ (setenv "ZIG_GLOBAL_CACHE_DIR"
+ (string-append (getcwd) "/zig-cache"))))
+ #$@(if (target-riscv64?)
+ ;; It is unclear why all these tests fail to build.
+ `((add-after 'unpack 'adjust-tests
+ (lambda _
+ (substitute* "build.zig"
+ ((".*addRuntimeSafetyTests.*") "")
+ ((".*addRunTranslatedCTests.*") ""))
+ (substitute* "test/standalone.zig"
+ ;; These tests fail to build on riscv64-linux.
+ ;; They both contain 'exe.linkSystemLibrary("c");'
+ ((".*shared_library.*") "")
+ ((".*mix_o_files.*") "")
+ ;; ld.lld: error: undefined symbol: __tls_get_addr
+ ;; Is this symbol x86 only in glibc?
+ ((".*link_static_lib_as_system_lib.*") "")))))
+ '())
+ (delete 'check)
+ (add-after 'install 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke (string-append #$output "/bin/zig")
+ ;; Testing the standard library takes >7.5GB RAM, and
+ ;; will fail if it is OOM-killed. The 'test-toolchain'
+ ;; target skips standard library and doc tests.
+ "build" "test-toolchain"
+ ;; Stage 2 is experimental, not what we run with `zig',
+
+ "-Dskip-stage2-tests"
+ ;; Non-native tests try to link and execute non-native
+ ;; binaries.
+ "-Dskip-non-native")))))))))
(define-public zig zig-0.10)
--
2.41.0
next prev parent reply other threads:[~2023-10-24 8:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-24 8:23 [bug#66723] [PATCH 0/3] gnu: zig-0.10: Inherit from zig-0.9 Hilton Chain via Guix-patches via
2023-10-24 8:34 ` [bug#66723] [PATCH 1/3] gnu: zig-0.10: Use gexp Hilton Chain via Guix-patches via
2023-10-24 8:34 ` Hilton Chain via Guix-patches via [this message]
2023-10-24 8:34 ` [bug#66723] [PATCH 3/3] gnu: zig-0.10: Inherit from zig-0.9 Hilton Chain via Guix-patches via
2023-11-19 11:35 ` [bug#66723] [PATCH 0/3] " guix-patches--- via
2023-11-23 15:23 ` Hilton Chain via Guix-patches via
2023-11-23 16:23 ` Ekaitz Zarraga
2023-11-25 14:10 ` bug#66723: " Hilton Chain via Guix-patches via
2023-11-22 12:12 ` [bug#66723] " Ludovic Courtès
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=55d3d44464c9b3df92a179c117669bd071066c05.1698134803.git.hako@ultrarare.space \
--to=guix-patches@gnu.org \
--cc=66723@debbugs.gnu.org \
--cc=hako@ultrarare.space \
/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.