From patchwork Mon Jul 8 09:03:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 65998 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5BA7127BBEA; Mon, 8 Jul 2024 10:04:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AE8CE27BBE2 for ; Mon, 8 Jul 2024 10:04:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQkHu-0006LU-S7; Mon, 08 Jul 2024 05:03:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sQkHt-0006LM-Sw for guix-patches@gnu.org; Mon, 08 Jul 2024 05:03:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sQkHt-0000sM-KG for guix-patches@gnu.org; Mon, 08 Jul 2024 05:03:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sQkHy-00085p-Bj for guix-patches@gnu.org; Mon, 08 Jul 2024 05:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71993] [PATCH core-updates 1/2] gnu: nss: Don't use libfaketime on 32bit systems. References: <87bk389sop.fsf@cbaines.net> In-Reply-To: <87bk389sop.fsf@cbaines.net> Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jul 2024 09:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71993 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71993@debbugs.gnu.org Received: via spool by 71993-submit@debbugs.gnu.org id=B71993.172042942431081 (code B ref 71993); Mon, 08 Jul 2024 09:04:02 +0000 Received: (at 71993) by debbugs.gnu.org; 8 Jul 2024 09:03:44 +0000 Received: from localhost ([127.0.0.1]:49663 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQkHg-00085C-Dg for submit@debbugs.gnu.org; Mon, 08 Jul 2024 05:03:44 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43920) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQkHd-00084v-Ta for 71993@debbugs.gnu.org; Mon, 08 Jul 2024 05:03:42 -0400 Received: from localhost (unknown [85.118.37.71]) by mira.cbaines.net (Postfix) with ESMTPSA id E3D3A27BBE2 for <71993@debbugs.gnu.org>; Mon, 8 Jul 2024 10:03:35 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 9ad91a8b for <71993@debbugs.gnu.org>; Mon, 8 Jul 2024 09:03:35 +0000 (UTC) From: Christopher Baines Date: Mon, 8 Jul 2024 11:03:33 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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(-) base-commit: 75b4a29e12011ae3d1814932591e80dcb0b80aae 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: ;; . 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.