[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/19: gnu: qemu-minimal: Fix build.
From: |
guix-commits |
Subject: |
03/19: gnu: qemu-minimal: Fix build. |
Date: |
Thu, 5 Mar 2020 18:10:17 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 08cf730a7ee1b4943f1c1b6a42a6ee9d08ee41c1
Author: Mathieu Othacehe <address@hidden>
AuthorDate: Tue Mar 3 12:45:33 2020 +0100
gnu: qemu-minimal: Fix build.
This fixes <https://issues.guix.info/issue/36882>.
* gnu/packages/virtualization.scm (qemu-minimal)[arguments]: Add a
remove-glibc phase to remove glibc from C_INCLUDE_PATH.
---
gnu/packages/virtualization.scm | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 256cfa8..225b5dd 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -13,6 +13,7 @@
;;; Copyright © 2019 Guy Fleury Iteriteka <address@hidden>
;;; Copyright © 2020 Jakub Kądziołka <address@hidden>
;;; Copyright © 2020 Brice Waegeneire <address@hidden>
+;;; Copyright © 2020 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -128,7 +129,7 @@
"1w38hzlw7xp05gcq1nhga7hxvndxy6dfcnzi7q2il8ff110isj6k"))))
(build-system gnu-build-system)
(arguments
- '(;; Running tests in parallel can occasionally lead to failures, like:
+ `(;; Running tests in parallel can occasionally lead to failures, like:
;; boot_sector_test: assertion failed (signature == SIGNATURE):
(0x00000000 == 0x0000dead)
#:parallel-tests? #f
#:configure-flags (list "--enable-usb-redir" "--enable-opengl"
@@ -139,8 +140,28 @@
"--audio-drv-list=alsa,pa,sdl")
;; Make build and test output verbose to facilitate investigation upon
failure.
#:make-flags '("V=1")
+ #:modules ((srfi srfi-1)
+ (ice-9 match)
+ ,@%gnu-build-system-modules)
#:phases
(modify-phases %standard-phases
+ (add-after 'set-paths 'hide-glibc
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Work around https://issues.guix.info/issue/36882. We need to
+ ;; remove glibc from C_INCLUDE_PATH so that the one hardcoded in
GCC,
+ ;; at the bottom of GCC include search-path is used.
+ (let* ((filters '("libc"))
+ (input-directories
+ (filter-map (lambda (input)
+ (match input
+ ((name . dir)
+ (and (not (member name filters))
+ dir))))
+ inputs)))
+ (set-path-environment-variable "C_INCLUDE_PATH"
+ '("include")
+ input-directories)
+ #t)))
(replace 'configure
(lambda* (#:key inputs outputs (configure-flags '())
#:allow-other-keys)
- branch core-updates updated (ebb7cf9 -> aca00b0), guix-commits, 2020/03/05
- 02/19: gnu: librsvg: Incorporate grafted changes., guix-commits, 2020/03/05
- 03/19: gnu: qemu-minimal: Fix build.,
guix-commits <=
- 01/19: gnu: zziplib: Incorporate grafted changes., guix-commits, 2020/03/05
- 06/19: gnu: Python: Update to 3.8.2., guix-commits, 2020/03/05
- 07/19: gnu: glib: Update to 2.62.5., guix-commits, 2020/03/05
- 08/19: gnu: meson: Update to 0.53.2., guix-commits, 2020/03/05
- 10/19: gnu: cURL: Update to 7.69.0., guix-commits, 2020/03/05
- 05/19: gnu: clang-runtime: Fix build with glibc 2.31., guix-commits, 2020/03/05
- 13/19: gnu: texlive-bin: Fix build with Poppler 0.86., guix-commits, 2020/03/05
- 14/19: gnu: coreutils: Update to 8.32., guix-commits, 2020/03/05
- 04/19: gnu: clang-runtime: Adjust for CPLUS_INCLUDE_PATH changes., guix-commits, 2020/03/05
- 09/19: gnu: fribidi: Update to 1.0.9., guix-commits, 2020/03/05