diff options
| author | Marius Bakke <marius@gnu.org> | 2020-05-26 22:34:46 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-05-26 22:34:46 +0200 |
| commit | aa13c5657d4f8b5dd52beda88a9a8ccc59ebca86 (patch) | |
| tree | 856094a6541a72b70d471ed5265d6e940cb11e55 /gnu/packages/elf.scm | |
| parent | 8ab211dbdb7df000a64aceadfe7b53488819d245 (diff) | |
| parent | b4f04e0efff1fb6112b84dc6d36ea46215c336b2 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/elf.scm')
| -rw-r--r-- | gnu/packages/elf.scm | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 5fa66210db..098c0fc94a 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> -;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> @@ -38,7 +38,9 @@ #:use-module (gnu packages python) #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) - #:use-module (gnu packages xml)) + #:use-module (gnu packages xml) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26)) (define-public elfutils (package @@ -67,10 +69,11 @@ (assoc-ref %outputs "out") "/lib")) - ;; Disable tests on MIPS (without changing + ;; Disable tests on MIPS and PowerPC (without changing ;; the arguments list on other systems). - ,@(if (string-prefix? "mips" (or (%current-target-system) - (%current-system))) + ,@(if (any (cute string-prefix? <> (or (%current-target-system) + (%current-system))) + '("mips" "powerpc")) '(#:tests? #f) '()) |