amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libgc@8: Build with '--disable-munmap'.

Browse source 
Partially fixes <https://bugs.gnu.org/40525>.

* gnu/packages/bdw-gc.scm (libgc)[arguments]: Configure with
'--disable-munmap'.
* gnu/packages/guile.scm (guile-3.0/libgc-7): Remove.
* gnu/packages/ci.scm (cuirass)[inputs]: Refer to GUILE-3.0-LATEST
instead of GUILE-3.0/LIBGC-7.
* guix/self.scm (specification->package): Likewise.
This commit is contained in:
Ludovic Courtès 2021-05-08 11:48:01 +02:00
parent 7b7bc91c3d
commit a605ef3ce9
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
4 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/bdw-gc.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2016, 2017, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2016, 2017, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org> ;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
@ -46,7 +46,11 @@
(list (list
;; Install gc_cpp.h et al. ;; Install gc_cpp.h et al.
"--enable-cplusplus" "--enable-cplusplus"
;; In GNU/Hurd systems during the 'Check' phase,
;; Work around <https://github.com/ivmai/bdwgc/issues/353>.
"--disable-munmap"
;; 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"
;; to configure script. See bug report and discussion: ;; to configure script. See bug report and discussion:

2
gnu/packages/ci.scm
View file

@ -150,7 +150,7 @@
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs)))
#t)))))) #t))))))
(inputs (inputs
`(("guile" ,guile-3.0/libgc-7) `(("guile" ,guile-3.0-latest)
("guile-avahi" ,guile-avahi) ("guile-avahi" ,guile-avahi)
("guile-fibers" ,guile-fibers) ("guile-fibers" ,guile-fibers)
("guile-gcrypt" ,guile-gcrypt) ("guile-gcrypt" ,guile-gcrypt)

11
gnu/packages/guile.scm
View file

@ -319,17 +319,6 @@ without requiring the source code to be rewritten.")
;; The latest 3.0.x version. ;; The latest 3.0.x version.
guile-3.0) guile-3.0)
(define-public guile-3.0/libgc-7
;; Using libgc-7 avoid crashes that can occur, particularly when loading
;; data in to the Guix Data Service:
;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=40525
(hidden-package
(package
(inherit guile-3.0-latest)
(propagated-inputs
`(("bdw-gc" ,libgc-7)
,@(srfi-1:alist-delete "bdw-gc" (package-propagated-inputs guile-3.0)))))))
(define-public guile-3.0/fixed (define-public guile-3.0/fixed
;; A package of Guile that's rarely changed. It is the one used in the ;; A package of Guile that's rarely changed. It is the one used in the
;; `base' module, and thus changing it entails a full rebuild. ;; `base' module, and thus changing it entails a full rebuild.

2
guix/self.scm
View file

@ -50,7 +50,7 @@
(let ((ref (lambda (module variable) (let ((ref (lambda (module variable)
(module-ref (resolve-interface module) variable)))) (module-ref (resolve-interface module) variable))))
(match-lambda (match-lambda
("guile" (ref '(gnu packages guile) 'guile-3.0/libgc-7)) ("guile" (ref '(gnu packages guile) 'guile-3.0-latest))
("guile-avahi" (ref '(gnu packages guile-xyz) 'guile-avahi)) ("guile-avahi" (ref '(gnu packages guile-xyz) 'guile-avahi))
("guile-json" (ref '(gnu packages guile) 'guile-json-4)) ("guile-json" (ref '(gnu packages guile) 'guile-json-4))
("guile-ssh" (ref '(gnu packages ssh) 'guile-ssh)) ("guile-ssh" (ref '(gnu packages ssh) 'guile-ssh))