guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/10: gnu: address@hidden: Fix build on aarch64-linux.


From: Efraim Flashner
Subject: 04/10: gnu: address@hidden: Fix build on aarch64-linux.
Date: Sun, 15 Jul 2018 16:11:36 -0400 (EDT)

efraim pushed a commit to branch master
in repository guix.

commit 080e11b48e6af05f6d051bfab6b4bd7830ef664c
Author: Efraim Flashner <address@hidden>
Date:   Sun Jul 15 21:49:21 2018 +0300

    gnu: address@hidden: Fix build on aarch64-linux.
    
    * gnu/packages/rust.scm (address@hidden)[arguments]: Replace inherited 
custom
    'patch-aarch64-test phase. Make sure all phases return #t.
---
 gnu/packages/rust.scm | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 761f396..28bffb4 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -554,14 +554,28 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
          ((#:phases phases)
           `(modify-phases ,phases
              (add-after 'patch-cargo-tests 'patch-cargo-index-update
-               (lambda* _
+               (lambda _
                  (substitute* "src/tools/cargo/tests/generate-lockfile.rs"
                    ;; This test wants to update the crate index.
-                   (("fn no_index_update") "#[ignore]\nfn no_index_update"))))
+                   (("fn no_index_update") "#[ignore]\nfn no_index_update"))
+                 #t))
              (add-after 'configure 'enable-codegen-tests
-               (lambda* _
+               (lambda _
                  (substitute* "config.toml"
-                   (("codegen-tests = false") ""))))
+                   (("codegen-tests = false") ""))
+                 #t))
+             (replace 'patch-aarch64-test
+               (lambda _
+                 (substitute* "src/librustc_metadata/dynamic_lib.rs"
+                   ;; This test is known to fail on aarch64 and powerpc64le:
+                   ;; https://github.com/rust-lang/rust/issues/45410
+                   (("fn test_loading_cosine") "#[ignore]\nfn 
test_loading_cosine"))
+                 ;; This test fails on aarch64 with address@hidden:
+                 ;; https://github.com/rust-lang/rust/issues/49807
+                 ;; other possible solution:
+                 ;; https://github.com/rust-lang/rust/pull/47688
+                 (delete-file 
"src/test/debuginfo/by-value-self-argument-in-trait-impl.rs")
+                 #t))
              (delete 'ignore-glibc-2.27-incompatible-test))))))))
 
 (define-public rust-1.26



reply via email to

[Prev in Thread] Current Thread [Next in Thread]