me
/
guix
Archived
1
0
Fork 0
Code

gnu: libgc: Use new style. 

* gnu/packages/bdw-gc.scm (libgc)[propagated-inputs]: Remove labels.
[arguments]: Use G-expression.
(libgc/static-libs, libgc/back-pointers)[arguments]: Likewise.
master
Marius Bakke 2022-06-30 01:09:47 +02:00
parent 01e1cf6fcf
commit 9959890264
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
;;; 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>
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -24,6 +24,7 @@
#:use-module (guix licenses) #:use-module (guix licenses)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
@ -42,30 +43,31 @@
"04ga3c95w5az5sznzm73j19lvvfpf6k4sgkpjqsmjxpsr6mi8j9v")))) "04ga3c95w5az5sznzm73j19lvvfpf6k4sgkpjqsmjxpsr6mi8j9v"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list
(list #:configure-flags
;; Install gc_cpp.h et al. #~(list
"--enable-cplusplus" ;; Install gc_cpp.h et al.
"--enable-cplusplus"
;; Work around <https://github.com/ivmai/bdwgc/issues/353>. ;; Work around <https://github.com/ivmai/bdwgc/issues/353>.
"--disable-munmap" "--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"
;; to configure script. See bug report and discussion: ;; to configure script. See bug report and discussion:
;; <https://lists.opendylan.org/pipermail/bdwgc/2017-April/006275.html> ;; <https://lists.opendylan.org/pipermail/bdwgc/2017-April/006275.html>
;; <https://lists.gnu.org/archive/html/bug-hurd/2017-01/msg00008.html> ;; <https://lists.gnu.org/archive/html/bug-hurd/2017-01/msg00008.html>
,@(if (target-hurd? (or (%current-system) #$@(if (target-hurd? (or (%current-system)
(%current-target-system))) (%current-target-system)))
'("--disable-gcj-support") #~("--disable-gcj-support")
'())))) #~()))))
(native-inputs (list pkg-config)) (native-inputs (list pkg-config))
(propagated-inputs (propagated-inputs
(if (%current-target-system) (if (%current-target-system)
;; The build system refuses to check for compiler intrinsics when ;; The build system refuses to check for compiler intrinsics when
;; cross-compiling, and demands using libatomic-ops instead. ;; cross-compiling, and demands using libatomic-ops instead.
`(("libatomic-ops" ,libatomic-ops)) (list libatomic-ops)
'())) '()))
(outputs '("out" "debug")) (outputs '("out" "debug"))
(synopsis "The Boehm-Demers-Weiser conservative garbage collector (synopsis "The Boehm-Demers-Weiser conservative garbage collector
@ -93,9 +95,11 @@ C or C++ programs, though that is not its primary goal.")
(define-public libgc/static-libs (define-public libgc/static-libs
(package/inherit (package/inherit
libgc libgc
(arguments (substitute-keyword-arguments (package-arguments libgc) (arguments
((#:configure-flags flags ''()) (substitute-keyword-arguments (package-arguments libgc)
`(cons "--enable-static" ,flags)))) ((#:configure-flags flags #~'())
#~(cons "--enable-static" #$flags))))
(properties '((hidden? . #t))))) (properties '((hidden? . #t)))))
(define-public libgc-7 (define-public libgc-7
@ -116,9 +120,9 @@ C or C++ programs, though that is not its primary goal.")
libgc libgc
(name "libgc-back-pointers") (name "libgc-back-pointers")
(arguments (arguments
`(#:make-flags (substitute-keyword-arguments (package-arguments libgc)
(list "CPPFLAGS=-DKEEP_BACK_PTRS=1") ((#:make-flags _ #~'())
,@(package-arguments libgc))) #~(list "CPPFLAGS=-DKEEP_BACK_PTRS=1"))))
(synopsis "The BDW garbage collector, with back-pointer tracking"))) (synopsis "The BDW garbage collector, with back-pointer tracking")))
(define-public libatomic-ops (define-public libatomic-ops