diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-06-08 14:46:24 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-06-08 14:46:24 +0200 |
| commit | 8c3e9da13a3c92a7db308db8c0d81cb474ad7799 (patch) | |
| tree | 88d06952aa5cc3a9c4991d9c43eb7950ff174fe1 /gnu/packages/nss.scm | |
| parent | 5439c04ebdb7b6405f5ea2446b375f1d155a8d95 (diff) | |
| parent | 0c5299200ffcd16370f047b7ccb187c60f30da34 (diff) | |
| download | guix-8c3e9da13a3c92a7db308db8c0d81cb474ad7799.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/nss.scm')
| -rw-r--r-- | gnu/packages/nss.scm | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 92f23bf166..b18c9213a3 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2021 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016-2019, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de> @@ -136,6 +136,11 @@ in the Mozilla clients.") (list "-C" "nss" (string-append "PREFIX=" out) "NSDISTMODE=copy" "NSS_USE_SYSTEM_SQLITE=1" + ;; The gtests fail to compile on riscv64. + ;; Skipping them doesn't affect the test suite. + ,@(if (target-riscv64?) + `("NSS_DISABLE_GTESTS=1") + '()) (string-append "NSPR_INCLUDE_DIR=" nspr "/include/nspr") ;; Add $out/lib/nss to RPATH. (string-append "RPATH=" rpath) @@ -145,6 +150,9 @@ in the Mozilla clients.") (ice-9 ftw) (ice-9 match) (srfi srfi-26)) + #:tests? ,(not (or (%current-target-system) + ;; Tests take more than 30 hours on riscv64-linux. + (target-riscv64?))) #:phases (modify-phases %standard-phases (replace 'configure |