[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/05: gnu: nss: Adjust make-flags for riscv64-linux.
From: |
guix-commits |
Subject: |
01/05: gnu: nss: Adjust make-flags for riscv64-linux. |
Date: |
Tue, 31 Aug 2021 03:43:45 -0400 (EDT) |
efraim pushed a commit to branch wip-riscv
in repository guix.
commit 28b3ab1f6346a7881a54d752a44a0880b5a8fc1e
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Aug 31 10:25:24 2021 +0300
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(-)
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index 55eddc0..2e32a50 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 Mark H Weaver
<mhw@netris.org>
-;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2018, 2019, 2021 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>
@@ -108,6 +108,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-riscv?)
+ `("NSS_DISABLE_GTESTS=1")
+ '())
(string-append "NSPR_INCLUDE_DIR=" nspr "/include/nspr")
;; Add $out/lib/nss to RPATH.
(string-append "RPATH=" rpath)