all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Christopher Baines <mail@cbaines.net>
To: 71993@debbugs.gnu.org
Subject: [bug#71993] [PATCH core-updates 1/2] gnu: nss: Don't use libfaketime on 32bit systems.
Date: Mon,  8 Jul 2024 11:03:33 +0200	[thread overview]
Message-ID: <b9be0a44b3a7ca7e33d05ee4cefa65d8c16d871d.1720429414.git.mail@cbaines.net> (raw)
In-Reply-To: <87bk389sop.fsf@cbaines.net>

As it fails to build and doesn't seem to work.

* gnu/packages/nss.scm (nss)[arguments]: Only use faketime on 64bit systems.
[native-inputs]: Only include libfaketime on 64bit systems.

Change-Id: I78bc9b7b2010e5b77f6184ffb7c87740ceae241c
---
 gnu/packages/nss.scm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index 49276817ae..2162254760 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -215,7 +215,12 @@ (define-public nss
                     ;; leading to test failures:
                     ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>.  To
                     ;; work around that, set the time to roughly the release date.
-                    (invoke "faketime" "2024-01-23" "./nss/tests/all.sh"))
+                    (invoke #$@(if (target-64bit?)
+                                   '("faketime" "2024-01-23")
+                                   ;; libfaketime is currently broken on 32bit
+                                   ;; systems
+                                   '())
+                            "./nss/tests/all.sh"))
                   (format #t "test suite not run~%"))))
           (replace 'install
             (lambda* (#:key outputs #:allow-other-keys)
@@ -240,7 +245,13 @@ (define-public nss
                 (copy-recursively (string-append obj "/lib") lib)))))))
     (inputs (list sqlite zlib))
     (propagated-inputs (list nspr))               ;required by nss.pc.
-    (native-inputs (list perl libfaketime which)) ;for tests
+    (native-inputs
+     `(,perl
+       ,@(if (target-64bit?)
+             (list libfaketime)
+             ;; libfaketime is currently broken on 32bit systems
+             '())
+       ,which)) ;for tests
 
     ;; The NSS test suite takes around 48 hours on Loongson 3A (MIPS) when
     ;; another build is happening concurrently on the same machine.

base-commit: 75b4a29e12011ae3d1814932591e80dcb0b80aae
-- 
2.45.2





  reply	other threads:[~2024-07-08  9:04 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-08  8:47 [bug#71993] [PATCH core-updates 0/2] Don't use libfaketime for key package tests on 32bit systems Christopher Baines
2024-07-08  9:03 ` Christopher Baines [this message]
2024-07-08  9:03   ` [bug#71993] [PATCH core-updates 2/2] gnu: python-pyopenssl: Don't use libfaketime " Christopher Baines
2024-07-08 12:26 ` [bug#71993] [PATCH core-updates 0/2] Don't use libfaketime for key package tests " Ludovic Courtès
2024-07-08 12:54   ` [bug#71993] [PATCH v3] gnu: libfaketime: Support compilation with glibc 2.39 on i686-linux Ludovic Courtès
2024-07-09  8:50 ` [bug#71993] retitle Christopher Baines
2024-07-21  1:03 ` [bug#71993] [PATCH core-updates 0/2] Don't use libfaketime for key package tests on 32bit systems Zheng Junjie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b9be0a44b3a7ca7e33d05ee4cefa65d8c16d871d.1720429414.git.mail@cbaines.net \
    --to=mail@cbaines.net \
    --cc=71993@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.