[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/14: gnu: guile: Fix building on riscv64-linux.
From: |
guix-commits |
Subject: |
05/14: gnu: guile: Fix building on riscv64-linux. |
Date: |
Fri, 6 Aug 2021 06:03:25 -0400 (EDT) |
efraim pushed a commit to branch wip-riscv
in repository guix.
commit 68506243b388d3f5f91c080c6336f566a503aa97
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Jul 28 12:44:02 2021 +0000
gnu: guile: Fix building on riscv64-linux.
* gnu/packages/guile.scm (guile-3.0)[arguments]: On riscv64-linux add a
phase to skip a failing test.
---
gnu/packages/guile.scm | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index fffc30f..f9a7125 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -65,7 +65,8 @@
#:use-module (guix deprecation)
#:use-module (guix utils)
#:use-module (ice-9 match)
- #:use-module ((srfi srfi-1) #:prefix srfi-1:))
+ #:use-module ((srfi srfi-1) #:prefix srfi-1:)
+ #:use-module (srfi srfi-26))
;;; Commentary:
;;;
@@ -346,14 +347,17 @@ without requiring the source code to be rewritten.")
;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=45214
(substitute* "bootstrap/Makefile.in"
(("^GUILE_OPTIMIZATIONS.*")
- "GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives
-Ocps\n"))))
- (add-after 'unpack 'skip-failing-fdes-test
- (lambda _
- ;; ERROR: ((system-error "seek" "~A" ("Bad file
descriptor") (9)))
- (substitute* "test-suite/tests/ports.test"
- (("fdes not closed\"" all) (string-append all "(exit
77)")))
- #t)))
- '())))))
+ "GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives
-Ocps\n")))))
+ '())
+ ,@(if (srfi-1:any (cute string-prefix? <> (%current-system))
+ '("powerpc-" "riscv64-"))
+ `((add-after 'unpack 'skip-failing-fdes-test
+ (lambda _
+ ;; ERROR: ((system-error "seek" "~A" ("Bad file
descriptor") (9)))
+ (substitute* "test-suite/tests/ports.test"
+ (("fdes not closed\"" all) (string-append all "(exit
77)")))
+ #t)))
+ '())))))
(native-search-paths
(list (search-path-specification
- branch wip-riscv created (now 8e25dd4), guix-commits, 2021/08/06
- 02/14: gnu: gcc-boot0: Use libstdc++-boot0-gcc7 on riscv64-linux., guix-commits, 2021/08/06
- 04/14: gnu: %boot3-inputs: Add missing input., guix-commits, 2021/08/06
- 08/14: gnu: elfutils: Fix building on riscv64-linux., guix-commits, 2021/08/06
- 05/14: gnu: guile: Fix building on riscv64-linux.,
guix-commits <=
- 03/14: new bootstrap binaries, guix-commits, 2021/08/06
- 06/14: gnu: %final-inputs: Add implied gcc:lib input., guix-commits, 2021/08/06
- 11/14: gnu: openssl: Fix build on riscv64-linux., guix-commits, 2021/08/06
- 13/14: gnu: openblas: Fix building on riscv64-linux., guix-commits, 2021/08/06
- 10/14: gnu: pcre: Fix building on riscv64-linux., guix-commits, 2021/08/06
- 14/14: gnu: mesa: Add support for riscv64-linux., guix-commits, 2021/08/06
- 01/14: WIP: bootstrap: Add support for riscv64-linux., guix-commits, 2021/08/06
- 07/14: gnu: bdb: Fix building on riscv64-linux., guix-commits, 2021/08/06
- 12/14: gnu: libtool: Fix building on riscv64-linux., guix-commits, 2021/08/06
- 09/14: utils: Define 'target-riscv?' predicate., guix-commits, 2021/08/06