From 19e1045352d33ae8074b0a6e891bfd4f6d95c134 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Aug 2021 10:25:24 +0300 Subject: gnu: nss: Adjust make-flags for riscv64-linux. * gnu/packages/nss.scm (nss)[arguments]: When building for riscv64-linux don't build the binaries with gtest. --- gnu/packages/nss.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages/nss.scm') diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index aae8886095..bf2003d927 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 ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2021 Mark H Weaver -;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020, 2021 Marius Bakke ;;; Copyright © 2020 Jonathan Brielmaier @@ -144,6 +144,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) -- cgit 1.4.1 From a037815f628326952fa78230189898a0505c5ca4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 May 2022 15:26:17 +0300 Subject: gnu: nss: Skip tests on riscv64-linux. * gnu/packages/nss.scm (nss)[arguments]: Skip tests when building for riscv64-linux. --- gnu/packages/nss.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/nss.scm') diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index bf2003d927..5e719ad5b8 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 ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2021 Mark H Weaver -;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner +;;; Copyright © 2016-2019, 2021, 2022 Efraim Flashner ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020, 2021 Marius Bakke ;;; Copyright © 2020 Jonathan Brielmaier @@ -158,6 +158,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 -- cgit 1.4.1