From a0c387cb7942742851397687c584b1cacefe5122 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 24 Jul 2023 08:14:58 +0300 Subject: gnu: nss: Fix building on powerpc-linux. * gnu/packages/nss.scm (nss)[arguments]: Skip tests on powerpc-linux. Adjust the configure-flags when building for powerpc-linux to not use features unavailable for that architecture. --- gnu/packages/nss.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 8088f23aa6..640eb5b2e4 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013-2019, 2023 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2021 Mark H Weaver -;;; Copyright © 2016-2019, 2021, 2022 Efraim Flashner +;;; Copyright © 2016-2019, 2021-2023 Efraim Flashner ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020, 2021 Marius Bakke ;;; Copyright © 2020 Jonathan Brielmaier @@ -155,13 +155,18 @@ in the Mozilla clients.") (ice-9 match) (srfi srfi-26)) #:tests? (not (or (%current-target-system) - ;; Tests take more than 30 hours on riscv64-linux. - (target-riscv64?))) + ;; Tests take more than 30 hours on some architectures. + (target-riscv64?) + (target-ppc32?))) #:phases #~(modify-phases %standard-phases (replace 'configure (lambda _ (setenv "CC" #$(cc-for-target)) + ;; No VSX on powerpc-linux. + #$@(if (target-ppc32?) + #~((setenv "NSS_DISABLE_CRYPTO_VSX" "1")) + #~()) ;; Tells NSS to build for the 64-bit ABI if we are 64-bit system. #$@(if (target-64bit?) #~((setenv "USE_64" "1")) -- cgit 1.4.1