diff options
| author | rennes <rennes@openmailbox.org> | 2017-05-01 08:41:04 -0500 |
|---|---|---|
| committer | Manolis Ragkousis <manolis837@gmail.com> | 2017-05-02 18:14:24 +0300 |
| commit | ed788c31cfac5ec864ad45fb09b2d014fc62461b (patch) | |
| tree | e230c72b84c45102370a39136fe2d1e86a3a78b1 /gnu | |
| parent | 4a4e60f43328cb494267abc16c3fc4d039c07323 (diff) | |
| download | patches-ed788c31cfac5ec864ad45fb09b2d014fc62461b.tar patches-ed788c31cfac5ec864ad45fb09b2d014fc62461b.tar.gz | |
gnu: libgc: Fix Check for Hurd systems.
* gnu/packages/bdw-gc.scm (libgc)[arguments]: On GNU/Hurd systems
add '--disable-gcj-support' to #:configure-flags. Adjust #:configure-flags
to disable GCJ support and pass the 'gctest' test.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/bdw-gc.scm | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index b9732374d7..790a238579 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> +;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,7 +24,8 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) - #:use-module (gnu packages pkg-config)) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages hurd)) (define-public libgc (package @@ -38,8 +40,20 @@ "143x7g0d0k6250ai6m2x3l4y352mzizi4wbgrmahxscv2aqjhjm1")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '(;; Install gc_cpp.h et al. - "--enable-cplusplus"))) + `(#:configure-flags + (list + ;; Install gc_cpp.h et al. + "--enable-cplusplus" + ;; In GNU/Hurd systems during the 'Check' phase, + ;; there is a deadlock caused by the 'gctest' test. + ;; To disable the error set "--disable-gcj-support" + ;; to configure script. See bug report and discussion: + ;; <https://lists.opendylan.org/pipermail/bdwgc/2017-April/006275.html> + ;; <https://lists.gnu.org/archive/html/bug-hurd/2017-01/msg00008.html> + ,@(if (hurd-triplet? (or (%current-system) + (%current-target-system))) + '("--disable-gcj-support") + '())))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("libatomic-ops" ,libatomic-ops))) (outputs '("out" "debug")) |