me
/
guix
Archived
1
0
Fork 0
Code

gnu: libgc: Update to 8.2.2 and remove '--disable-munmap'. 

* gnu/packages/bdw-gc.scm (libgc): Update to 8.2.2.
[arguments]: Remove "--disable-munmap" from #:configure-flags.
* gnu/packages/guile.scm (guile-3.0)[source]: Leave 'test-out-of-memory'
test untouched.
(guile-next)[arguments]: Likewise, in 'skip-failing-tests' phase.
(guile-for-guile-emacs)[arguments]: Likewise, in 'bootstrap' phase.
master
Ludovic Courtès 2023-02-28 17:42:32 +01:00
parent 7df09ee0ab
commit 5222ed8dc3
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/bdw-gc.scm
View File

@ -34,7 +34,7 @@
(define-public libgc (define-public libgc
(package (package
(name "libgc") (name "libgc")
(version "8.0.6") (version "8.2.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "https://github.com/ivmai/bdwgc/releases" (uri (list (string-append "https://github.com/ivmai/bdwgc/releases"
@ -44,7 +44,7 @@
"/gc-" version ".tar.gz"))) "/gc-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"04ga3c95w5az5sznzm73j19lvvfpf6k4sgkpjqsmjxpsr6mi8j9v")))) "181ni2rn9qjbl4ilqdjrd1a4h8siv5bgmzqgg4595q32n2y0f0gk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
@ -53,9 +53,6 @@
;; Install gc_cpp.h et al. ;; Install gc_cpp.h et al.
"--enable-cplusplus" "--enable-cplusplus"
;; Work around <https://github.com/ivmai/bdwgc/issues/353>.
"--disable-munmap"
;; In GNU/Hurd systems during the 'check' phase, ;; In GNU/Hurd systems during the 'check' phase,
;; there is a deadlock caused by the 'gctest' test. ;; there is a deadlock caused by the 'gctest' test.
;; To disable the error set "--disable-gcj-support" ;; To disable the error set "--disable-gcj-support"

16
gnu/packages/guile.scm
View File

@ -325,11 +325,8 @@ without requiring the source code to be rewritten.")
(patches '()) (patches '())
;; Replace the snippet because the oom-test still ;; Replace the snippet because the oom-test still
;; fails on some 32-bit architectures. ;; fails on some 32-bit architectures.
(snippet '(begin (snippet '(for-each delete-file
(substitute* "test-suite/standalone/Makefile.in" (find-files "prebuilt" "\\.go$")))))
(("test-out-of-memory") ""))
(for-each delete-file
(find-files "prebuilt" "\\.go$"))))))
;; 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>.
@ -448,10 +445,7 @@ without requiring the source code to be rewritten.")
(display ,version port))))) (display ,version port)))))
(add-before 'check 'skip-failing-tests (add-before 'check 'skip-failing-tests
(lambda _ (lambda _
(substitute* "test-suite/standalone/test-out-of-memory" (delete-file "test-suite/tests/version.test")))))))
(("!#") "!#\n\n(exit 77)\n"))
(delete-file "test-suite/tests/version.test")
#t))))))
(native-inputs (native-inputs
(modify-inputs (package-native-inputs guile-3.0) (modify-inputs (package-native-inputs guile-3.0)
(prepend autoconf (prepend autoconf
@ -575,10 +569,6 @@ GNU@tie{}Guile. Use the @code{(ice-9 readline)} module and call its
(substitute* "test-suite/tests/version.test" (substitute* "test-suite/tests/version.test"
(("\\(pass-if \"version reporting works\"" m) (("\\(pass-if \"version reporting works\"" m)
(string-append "#;" m))) (string-append "#;" m)))
;; Warning: Unwind-only `out-of-memory' exception; skipping pre-unwind handler.
;; FAIL: test-out-of-memory
(substitute* "test-suite/standalone/Makefile.am"
(("(check_SCRIPTS|TESTS) \\+= test-out-of-memory") ""))
(patch-shebang "build-aux/git-version-gen") (patch-shebang "build-aux/git-version-gen")
(invoke "sh" "autogen.sh") (invoke "sh" "autogen.sh")