From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id qNsUHM1enGZ3mgAAe85BDQ:P1 (envelope-from ) for ; Sun, 21 Jul 2024 01:05:17 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id qNsUHM1enGZ3mgAAe85BDQ (envelope-from ) for ; Sun, 21 Jul 2024 03:05:17 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1721523917; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=rM7SW/iwcU/lr5ugnduNs41Zo9GnR32gqcxegaqH3UI=; b=aNT++jYzfwQQaz65CUjokNq9UsClwrEOo7DFGvSteeOx80qB7OCPYDVhoVMJMxUmC5wqAD 3tsgkGgIwGvzNTjiL9+oZOiwoK3rnWz6xVVruqGBetw2im0SVG4AWdZIFpK7AnqL2OtRP5 VXIgRZiMyrQhJeNDfRZYUsLEQqtyIwg3qReFFPFqN02CuSB5uvUcnq7OraWsjvfQJmjPJi F6YY6R+ps8dEaTVhHV9LfYG9Q7gz9WIhIlCkb8Du4lEgSdTRiVHTZhaxQ5fzFtxH270o9C wadk+05+cKxx8j0Aab22QS3z7mLV58oRAtcD3/eA2Gde2rzwF8AEDlTBdPBhWA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1721523917; a=rsa-sha256; cv=none; b=tWR5TCF0NUnRgnB1dBsz4IqlZhqiJ+MtzyyAimeWDThMlNy98sRFH5NEpMQYCz9+gz68c/ NXZuxPnQ7gsiOGsHmRAWMEzAaZbXw02YYZC666bah7tW6GBFL2ZtLZ6pZA+VtTYcOYNgpd RSVi5+XFZKCheJP9gR5gBa5xxTQru7c/uvfkBshz5M6lT5RqKSyjLgVKq9nTX6rdT2Q6gg YJLXRqW/gesKSXAHt+uj8xaQy3zBiUiP3H16ugM0wV0sP/dpFQjtLuJQ9oWvaQd8IntZUY YPR88/Is9fbAJNeLp6h/y1Jts2FSuSpsZ2fgZLb6SZl2tECVjlK750SvL+26vw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 520D723200 for ; Sun, 21 Jul 2024 03:05:15 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sVL0b-0003yJ-15; Sat, 20 Jul 2024 21:05:05 -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 1sVL0X-0003xx-Px for guix-patches@gnu.org; Sat, 20 Jul 2024 21:05:01 -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 1sVL0X-0005jE-Gl for guix-patches@gnu.org; Sat, 20 Jul 2024 21:05:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sVL0Y-0005c2-Dw for guix-patches@gnu.org; Sat, 20 Jul 2024 21:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71993] [PATCH core-updates 0/2] Don't use libfaketime for key package tests on 32bit systems Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Jul 2024 01:05: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: Christopher Baines Cc: 71993@debbugs.gnu.org Received: via spool by 71993-submit@debbugs.gnu.org id=B71993.172152385221504 (code B ref 71993); Sun, 21 Jul 2024 01:05:02 +0000 Received: (at 71993) by debbugs.gnu.org; 21 Jul 2024 01:04:12 +0000 Received: from localhost ([127.0.0.1]:54536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sVKzj-0005al-O6 for submit@debbugs.gnu.org; Sat, 20 Jul 2024 21:04:12 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:38038 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sVKzf-0005a8-9y for 71993@debbugs.gnu.org; Sat, 20 Jul 2024 21:04:10 -0400 Received: from m (unknown [64.176.166.156]) by APP-05 (Coremail) with SMTP id zQCowABHLThvXpxmisQVAA--.646S2; Sun, 21 Jul 2024 09:03:48 +0800 (CST) From: Zheng Junjie In-Reply-To: <87bk389sop.fsf@cbaines.net> (Christopher Baines's message of "Mon, 08 Jul 2024 10:47:02 +0200") References: <87bk389sop.fsf@cbaines.net> Date: Sun, 21 Jul 2024 09:03:36 +0800 Message-ID: <87wmlf5zfb.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: zQCowABHLThvXpxmisQVAA--.646S2 X-Coremail-Antispam: 1UD129KBjvdXoW7GrW7uw4rXw1fKFy8KFyUKFg_yoWkXFg_GF 4xJa93Xws5XFWkuFZrJ3WrCry5GrW7Z3W5Za17Xr97uryfA347t3ZFkryYvFW5uayrG34U GF4IyryFkr9xZjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbskYjsxI4VWkKwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM2 8CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0 cI8IcVCY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4 A2jsIEc7CjxVAFwI0_GcCE3s1lnx0Ee4C267I2x7xF54xIwI0E7I0Y6sxI4wAS0I0E0xvY zxvE52x082IY62kv0487M2AExVA0xI801c8C04v7Mc02F40EFcxC0VAKzVAqx4xG6I80ew Av7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY 6r1j6r4UM4x0Y48IcVAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r 4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF 67AKxVWUXVWUAwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2I x0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2 z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa73Uj IFyTuYvjxU6cdbDUUUU X-Originating-IP: [64.176.166.156] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -8.51 X-Migadu-Queue-Id: 520D723200 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -8.51 X-TUID: CRA0Ld4PUuUB --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Christopher Baines writes: > As it fails to build and seems broken. > > > Christopher Baines (2): > gnu: nss: Don't use libfaketime on 32bit systems. > gnu: python-pyopenssl: Don't use libfaketime on 32bit systems. > > gnu/packages/nss.scm | 15 +++++++++++++-- > gnu/packages/python-crypto.scm | 10 ++++++++-- > 2 files changed, 21 insertions(+), 4 deletions(-) libfaketime is actually good, it just fails the test because coreutils uses 64bit time_t. gnulib will enable 64bit time_t on 32bit platforms, but we don't currently support this, mixed abi will cause many problems[1], so turning off 64bit time_t on coreutils can fix libfaketime's tests, and nss can also use libfaketime because they use same time_t. And libfaketime is not provided 64-bit time_t support on 32-bit archs, see https://github.com/wolfcw/libfaketime/issues/418 We need to open a new branch to migrate time64 later And see also https://wiki.gentoo.org/wiki/Project:Toolchain/time64_migration https://wiki.debian.org/ReleaseGoals/64bit-time [1] https://bugs.gentoo.org/828001 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-Revert-gnu-libfaketime-Support-compilation-with-glib.patch Content-Transfer-Encoding: quoted-printable From=205cbb346385201fb6fce1057a13a49c7977e9dd34 Mon Sep 17 00:00:00 2001 Message-ID: <5cbb346385201fb6fce1057a13a49c7977e9dd34.1721522810.git.zhengj= unjie@iscas.ac.cn> From: Zheng Junjie Date: Sat, 20 Jul 2024 22:35:27 +0800 Subject: [PATCH 1/2] Revert "gnu: libfaketime: Support compilation with gli= bc 2.39 on i686-linux." This reverts commit 127f1842fb037cc5acfc5406e373ccd723127732. =2D-- gnu/packages/check.scm | 38 +++----------------------------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 70f828b2a1..0ec375069e 100644 =2D-- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -26,7 +26,7 @@ ;;; Copyright =C2=A9 2017 Nikita ;;; Copyright =C2=A9 2015, 2017, 2018, 2020, 2021, 2023, 2024 Ricardo Wurm= us ;;; Copyright =C2=A9 2016-2022 Marius Bakke =2D;;; Copyright =C2=A9 2017-2018, 2020-2021, 2024 Ludovic Court=C3=A8s +;;; Copyright =C2=A9 2017, 2018, 2020, 2021 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2018 Fis Trivial ;;; Copyright =C2=A9 2019, 2021 Pierre Langlois ;;; Copyright =C2=A9 2019 Chris Marusich @@ -3478,32 +3478,6 @@ (define-public libfaketime (substitute* "src/faketime.c" (("\"date\"") (format #f "~s" (search-input-file inputs "bin/date")))))) =2D =2D #$@(if (target-64bit?) =2D #~() =2D #~((add-after 'unpack 'switch-libc-call =2D (lambda _ =2D (substitute* "src/libfaketime.c" =2D (("#define _GNU_SOURCE") =2D ;; Make sure to use the 64-bit 'struct timesp= ec' in =2D ;; replacement functions. =2D (string-append "#define _GNU_SOURCE\n" =2D "#define _FILE_OFFSET_BITS 64\= n" =2D "#define _TIME_BITS 64\n")) =2D (("\"__clock_gettime\"") =2D ;; Replace '__clock_gettime64' rather than =2D ;; '__clock_gettime64' since this is what =2D ;; newly-built applications use. =2D "\"__clock_gettime64\"")) =2D =2D ;; XXX: Turn off 'pthread_cond_timedwait' etc.: = tests =2D ;; related to this are failing and this feature = is =2D ;; probably not useful for the purposes of runni= ng =2D ;; code at a fixed date. =2D (substitute* "src/Makefile" =2D (("-DFAKE_PTHREAD") =2D "")))))) =2D (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (setenv "CC" #$(cc-for-target)) @@ -3522,14 +3496,8 @@ (define-public libfaketime (add-before 'check 'pre-check (lambda _ (substitute* "test/functests/test_exclude_mono.sh" =2D (("/bin/bash") (which "bash"))) =2D #$@(if (target-64bit?) =2D #~() =2D ;; XXX: This test uses Perl to call 'clock_gettime'= and =2D ;; fails for unclear reasons on i686-linux. =2D #~((delete-file =2D "test/functests/test_exclude_mono.sh")))))))) =2D (native-inputs (list perl)) ;for tests + (("/bin/bash") (which "bash")))))))) + (native-inputs (list perl)) ;for tests (inputs (list coreutils-minimal)) (synopsis "Fake the system time for single applications") (description base-commit: 3f15785c71eb82832ac0520c762a18a51861a141 =2D-=20 2.45.2 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-coreutils-Disable-64bit-time_t-on-32bit-platform.patch Content-Transfer-Encoding: quoted-printable From=20273c1c1189d824b86ae531bd1b5df601f0e7e838 Mon Sep 17 00:00:00 2001 Message-ID: <273c1c1189d824b86ae531bd1b5df601f0e7e838.1721522810.git.zhengj= unjie@iscas.ac.cn> In-Reply-To: <5cbb346385201fb6fce1057a13a49c7977e9dd34.1721522810.git.zheng= junjie@iscas.ac.cn> References: <5cbb346385201fb6fce1057a13a49c7977e9dd34.1721522810.git.zhengj= unjie@iscas.ac.cn> From: Zheng Junjie Date: Sun, 21 Jul 2024 08:36:28 +0800 Subject: [PATCH 2/2] gnu: coreutils: Disable 64bit time_t on 32bit platform. * gnu/packages/nss.scm (nss)[arguments]<#:configure-flags>: Pass gl_cv_type_time_t_bits_macro=3Dno on 32bit platform. Change-Id: I3ba9e21733727a41f2070a27ccba39c9d5f2d406 =2D-- gnu/packages/base.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index bc30d73426..47488c1603 100644 =2D-- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -471,6 +471,13 @@ (define-public coreutils " test-renameatu" " test-utimensat"))) '()) + ,@(if (target-64bit?) + '() + ;; We currently do not support 64-bit time_t on 32-bit platfor= ms, + ;; mixing different bits of time_t will cause a lot of problems + ;; so forcibly disable it. + ;; see https://wiki.gentoo.org/wiki/Project:Toolchain/time64_m= igration + '(#:configure-flags (list "gl_cv_type_time_t_bits_macro=3Dno")= )) #:phases (modify-phases %standard-phases (add-before 'build 'patch-shell-references (lambda _ =2D-=20 2.45.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmacXmgACgkQO1qpk+Gi 3/Dljw/+OHgA73Jqa9b1JW54Dh4emmrTsK6be/lNTKzRX+SVYLcDefRiAs56nQkA xXDVSEntm8R59Ye4zOo/FrKhPzG9Anq/bEJ/sJJPs6jis+MIqOaubvU8dL4cuSuq MEh6dHJUaZoCoDApX3195zLsqASFYiCj9UjUuu/U3qvx8XZnzs91uNAJZTFgm519 j+Mi5KL6zZVqsGI1F8UaZUuxg5Ig1SY+XuqSLMF2omVoN3ECcZnaiSH2PSeYncV1 qaoxOnUFxsmoC83AYDxx5w/kArvB9qn/rr+wrO8ko7kIluNBZSXSMaO4ZYy23pAM s/jaa2rRrLbh+vOA7748vNu96wtfsihkh3ZWUV03wVPH/+RVeuDZKjmnARpdsHj0 gxj+UKXHgI9Stl+Qes1bY4J2GZ5RqfnxXgUV8ekWWurN8YbxIpiMcSqDs6FJMZNs rUBSubxv5GwQN1U8wYlPjt59QGdsDrteoEPmLbWF16O0OGsk+C4iJUzg3Wz9ucQo Gdyt359BWfC5QFz9HwzpLrD9FS32a7a6KxlcLf3YkKVbfjd6gVzdrS2jgpsC69ZS yD+mO/UnW7nlnD0mhuwHIi5x02vJMnO5Ke6jFO1M1q7LoSB9dmMCjOc4CV7ORg34 CS7cOflLLUpQe9wq+Ykdjq3BIULSHKGSjT7FwXIIMuC8LDmk9mo= =9hyP -----END PGP SIGNATURE----- --==-=-=--