mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-13 22:50:23 -05:00
gnu: guile-3.0: Fix building on powerpc-linux.
* gnu/packages/guile.scm (guile-3.0)[source]: Adjust snippet to skip OOM-test. [arguments]: On powerpc add a phase to adjust the compile flags during the bootstrap process. Add phase to skip known failing test.
This commit is contained in:
parent
d92ee0a8bd
commit
9ba35475ed
1 changed files with 30 additions and 4 deletions
|
@ -293,13 +293,21 @@ (define-public guile-3.0
|
||||||
(name "guile")
|
(name "guile")
|
||||||
(version "3.0.7")
|
(version "3.0.7")
|
||||||
(source (origin
|
(source (origin
|
||||||
(inherit (package-source guile-2.2)) ;preserve snippet
|
(inherit (package-source guile-2.2))
|
||||||
(patches '())
|
(patches '()) ; We no longer need the patches.
|
||||||
(uri (string-append "mirror://gnu/guile/guile-"
|
(uri (string-append "mirror://gnu/guile/guile-"
|
||||||
version ".tar.xz"))
|
version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1dwiwsrpm4f96alfnz6wibq378242z4f16vsxgy1n9r00v3qczgm"))))
|
"1dwiwsrpm4f96alfnz6wibq378242z4f16vsxgy1n9r00v3qczgm"))
|
||||||
|
;; Replace the snippet because the oom-test still
|
||||||
|
;; fails on some 32-bit architectures.
|
||||||
|
(snippet '(begin
|
||||||
|
(substitute* "test-suite/standalone/Makefile.in"
|
||||||
|
(("test-out-of-memory") ""))
|
||||||
|
(for-each delete-file
|
||||||
|
(find-files "prebuilt" "\\.go$"))
|
||||||
|
#t))))
|
||||||
|
|
||||||
;; Build with the bundled mini-GMP to avoid interference with GnuTLS' own
|
;; Build with the bundled mini-GMP to avoid interference with GnuTLS' own
|
||||||
;; use of GMP via Nettle: <https://issues.guix.gnu.org/46330>.
|
;; use of GMP via Nettle: <https://issues.guix.gnu.org/46330>.
|
||||||
|
@ -314,7 +322,25 @@ (define-public guile-3.0
|
||||||
;; XXX: JIT-enabled Guile crashes in obscure ways on GNU/Hurd.
|
;; XXX: JIT-enabled Guile crashes in obscure ways on GNU/Hurd.
|
||||||
(if (hurd-target?)
|
(if (hurd-target?)
|
||||||
`(cons "--disable-jit" ,flags)
|
`(cons "--disable-jit" ,flags)
|
||||||
flags)))))
|
flags)))
|
||||||
|
((#:phases phases)
|
||||||
|
(if (string-prefix? "powerpc-" (%current-system))
|
||||||
|
`(modify-phases ,phases
|
||||||
|
(add-after 'unpack 'adjust-bootstrap-flags
|
||||||
|
(lambda _
|
||||||
|
;; Upstream knows about suggested solution.
|
||||||
|
;; 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)))
|
||||||
|
phases))))
|
||||||
|
|
||||||
(native-search-paths
|
(native-search-paths
|
||||||
(list (search-path-specification
|
(list (search-path-specification
|
||||||
(variable "GUILE_LOAD_PATH")
|
(variable "GUILE_LOAD_PATH")
|
||||||
|
|
Loading…
Reference in a new issue