[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/09: gnu: libratbag: Only build with valgrind on supported systems.
From: |
guix-commits |
Subject: |
07/09: gnu: libratbag: Only build with valgrind on supported systems. |
Date: |
Tue, 12 Jul 2022 10:41:49 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit 321bb9f0e90140da6a7b064ce3892b261a494ece
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Jul 12 16:18:41 2022 +0300
gnu: libratbag: Only build with valgrind on supported systems.
* gnu/packages/gnome.scm (libratbag)[arguments]: Disable some tests when
valgrind isn't present.
[native-inputs]: Only add valgrind on systems which support it.
---
gnu/packages/gnome.scm | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f8665c215c..27eb065043 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11,7 +11,7 @@
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus
<rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2018, 2021 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 David Thompson <davet@gnu.org>
-;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner
<efraim@flashner.co.il>
+;;; Copyright © 2015-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2018 Rene Saavedra <pacoon@protonmail.com>
;;; Copyright © 2016 Jochem Raat <jchmrt@riseup.net>
;;; Copyright © 2016, 2017, 2019 Kei Kebreau <kkebreau@posteo.net>
@@ -11937,7 +11937,10 @@ It uses pandoc as back-end for parsing Markdown.")
(arguments
`(#:configure-flags
(list "-Dsystemd=false"
- "-Dlogind-provider=elogind")
+ "-Dlogind-provider=elogind"
+ ,@(if (not (package? (this-package-native-input "valgrind")))
+ `("-Dtests=false") ; Some tests still run.
+ `()))
#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap
@@ -11957,7 +11960,11 @@ It uses pandoc as back-end for parsing Markdown.")
python-wrap)
#t))))))
(native-inputs
- (list check pkg-config swig valgrind))
+ (append
+ (list check pkg-config swig)
+ (if (member (%current-system) (package-supported-systems valgrind))
+ (list valgrind)
+ '())))
(inputs
`(("glib" ,glib)
("json-glib" ,json-glib)
- branch master updated (9173cb522d -> 094505d56c), guix-commits, 2022/07/12
- 09/09: gnu: numactl: Enable armhf-linux as a supported system., guix-commits, 2022/07/12
- 08/09: gnu: numactl: Fix building on riscv64-linux., guix-commits, 2022/07/12
- 06/09: gnu: bcachefs-tools: Enable tests., guix-commits, 2022/07/12
- 05/09: gnu: bcachefs-tools: Only build with valgrind on supported systems., guix-commits, 2022/07/12
- 03/09: gnu: python-tornado-6: Adjust test timeout., guix-commits, 2022/07/12
- 02/09: gnu: python-tornado-6: Honor tests flag., guix-commits, 2022/07/12
- 07/09: gnu: libratbag: Only build with valgrind on supported systems.,
guix-commits <=
- 04/09: gnu: sbcl: Fix building on armhf-linux., guix-commits, 2022/07/12
- 01/09: gnu: python-attrs: Remove test deadlines on riscv64-linux., guix-commits, 2022/07/12