From 4fc2132741aee4d6efed1545757b042c2c67acb7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 9 Apr 2020 22:26:29 +0200 Subject: gnu: qemu: Skip tests on i686-linux. * gnu/packages/virtualization.scm (qemu)[arguments]: Add #:tests?. --- gnu/packages/virtualization.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 5bee79cbb4..bfaf462e24 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2020 Ludovic Courtès ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver ;;; Copyright © 2016, 2017, 2018. 2019 Efraim Flashner ;;; Copyright © 2016, 2017 Ricardo Wurmus @@ -129,9 +129,15 @@ "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 + + ;; FIXME: Disable tests on i686 to work around + ;; . + #:tests? ,(or (%current-target-system) + (not (string=? "i686-linux" (%current-system)))) + #:configure-flags (list "--enable-usb-redir" "--enable-opengl" "--enable-docs" (string-append "--smbd=" -- cgit v1.2.3 From 6177320d7816f2115bb0f6027cd51c29903fe45e Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 14 Apr 2020 12:02:34 +0200 Subject: gnu: xen: Fix build failure. * gnu/packages/virtualization.scm (xen)[arguments]<#:phases>[set-environment-up]: Use CPATH instead of C_INCLUDE_PATH, CPLUS_INCLUDE_PATH. --- gnu/packages/virtualization.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 0fded11f3a..bca3c917b2 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1290,14 +1290,13 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc")) new-search-path ":"))) (setenv env-name new-env-value))) environment-variable-names)) - (setenv "CROSS_C_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) - (setenv "CROSS_CPLUS_INCLUDE_PATH" (getenv "CPLUS_INCLUDE_PATH")) + (setenv "CROSS_CPATH" (getenv "CPATH")) (setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH")) (filter-environment! cross? - '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH" + '("CROSS_CPATH" "CROSS_LIBRARY_PATH")) (filter-environment! (lambda (e) (not (cross? e))) - '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" + '("CPATH" "LIBRARY_PATH")) ;; Guix tries to be helpful and automatically adds ;; mini-os-git-checkout/include to the include path, @@ -1306,7 +1305,7 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc")) (not (string-contains e "mini-os-git-checkout"))) - '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" + '("CPATH" "LIBRARY_PATH")) (setenv "EFI_VENDOR" "guix") #t)) -- cgit v1.2.3 From 45c54093d5d861fb2a34d45b922408e36fd49405 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 14 Apr 2020 14:26:32 +0200 Subject: gnu: xen: Update to 4.13.0. * gnu/packages/virtualization.scm (xen): Update to 4.13.0. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index bca3c917b2..c00f3ef9a8 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1167,7 +1167,7 @@ DOS or Microsoft Windows.") (define-public xen (package (name "xen") - (version "4.11.1") + (version "4.13.0") (source (origin (method git-fetch) (uri (git-reference @@ -1176,7 +1176,7 @@ DOS or Microsoft Windows.") (file-name (git-file-name name version)) (sha256 (base32 - "1wv1hyfii14vi9lfjmnv07h2gpm3b7kvh2p55f4yy2b40simksgk")))) + "0py50n995gv909i0d1lfdcj9wcp5g1d5z6m2291jqqlfyany138g")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3