GNU logs - #71993, boring messages

Message sent to guix-patches@HIDDEN:

Subject: [bug#71993] [PATCH core-updates 0/2] Don't use libfaketime for key package tests on 32bit systems
Resent-From: Christopher Baines <mail@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jul 2024 08:48:02 +0000
Resent-Message-ID: <handler.71993.B.172042843529324 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 71993 <at> debbugs.gnu.org
From: Christopher Baines <mail@HIDDEN>
User-Agent: mu4e 1.12.4; emacs 29.3
Date: Mon, 08 Jul 2024 10:47:02 +0200
Message-ID: <87bk389sop.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27;
 envelope-from=mail@HIDDEN; helo=mira.cbaines.net
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.4 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.4 (--)

--=-=-=
Content-Type: text/plain

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(-)

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmaLp4ZfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XdjmA/7BpMH558zHAm5qAGciz7mGeETqe6CwulT
frVY5v5nH/+WpVJNi0YR5yx2esoOJbXHKm6lTaU2fKXf/pUJeZ4v3Kgc/Uk1u73T
P6/XRdBC0CSFMudjEzHUY5pUlcPZbUdE/VejH5nBivJnlH3L+nclTM8P3Z0hIVH+
E1WJbC36/d8BDC+7mKmikgFi9kjqEHGYB5BcvpX8tg0WJ8QagRTc6V/vde7KuFfW
QOVskTflZXoxLhyI87nwf5BftbbbuKK0S8HHE92UJJRQH3ypYJpyx8KFupvdnNqi
iqsG+qU9iFcCy79A7K7JDhKHNKT086gF5j+rV5RQDv0YKwt4kOf3F2gJThzbVSxg
gbwZkACV7hO6BEhpcB6nwrs1KT2A9GcmfzEuR2D/lVkseX2zF6rzRk6ohVLP9Yhc
uFYudF62Hf/1uhwyCRT8wzNPUwNjXZ9lBJLKwj3l2M4hYJLqZ6aB34efLNZ715Br
B/MxIqMXG6ieNW1JM4HeqImG3oGcZ5WA4JFxF52v+bYczFU7pZNvOYoYR3Qa5Yto
IacY7JuuUnVshcdR9b2PJ6LIoXb8uxx0ENIIXK//beAGMxUuBiQxEeySWnaqsrQc
HjiQO/B+8XWiu/yt/cgS1IrqBCKQa9E7U8jvlcG6JTgXBUyG//Fh6HMXs/fE5UlY
RyHnG3XmFTE=
=SuMj
-----END PGP SIGNATURE-----
--=-=-=--

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Christopher Baines <mail@HIDDEN>
Subject: bug#71993: Acknowledgement ([PATCH core-updates 0/2] Don't use
 libfaketime for key package tests on 32bit systems)
Message-ID: <handler.71993.B.172042843529324.ack <at> debbugs.gnu.org>
References: <87bk389sop.fsf@HIDDEN>
X-Gnu-PR-Message: ack 71993
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 71993 <at> debbugs.gnu.org
Date: Mon, 08 Jul 2024 08:48:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 71993 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
71993: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D71993
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to guix-patches@HIDDEN:

Subject: [bug#71993] [PATCH core-updates 1/2] gnu: nss: Don't use libfaketime on 32bit systems.
References: <87bk389sop.fsf@HIDDEN>
In-Reply-To: <87bk389sop.fsf@HIDDEN>
Resent-From: Christopher Baines <mail@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jul 2024 09:04:02 +0000
Resent-Message-ID: <handler.71993.B71993.172042942431081 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 71993 <at> debbugs.gnu.org
From: Christopher Baines <mail@HIDDEN>
Date: Mon,  8 Jul 2024 11:03:33 +0200
Message-ID: <b9be0a44b3a7ca7e33d05ee4cefa65d8c16d871d.1720429414.git.mail@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

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

Message sent to lars@HIDDEN, marius@HIDDEN, me@HIDDEN, sharlatanus@HIDDEN, tanguy@HIDDEN, jgart@HIDDEN, guix-patches@HIDDEN:

Subject: [bug#71993] [PATCH core-updates 2/2] gnu: python-pyopenssl: Don't use libfaketime on 32bit systems.
Resent-From: Christopher Baines <mail@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: lars@HIDDEN, marius@HIDDEN, me@HIDDEN, sharlatanus@HIDDEN, tanguy@HIDDEN, jgart@HIDDEN, guix-patches@HIDDEN
Resent-Date: Mon, 08 Jul 2024 09:05:01 +0000
Resent-Message-ID: <handler.71993.B71993.172042945431172 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 71993 <at> debbugs.gnu.org
Cc: Lars-Dominik Braun <lars@HIDDEN>, Marius Bakke <marius@HIDDEN>, Munyoki Kilyungi <me@HIDDEN>, Sharlatan Hellseher <sharlatanus@HIDDEN>, Tanguy Le Carrour <tanguy@HIDDEN>, jgart <jgart@HIDDEN>
From: Christopher Baines <mail@HIDDEN>
Date: Mon,  8 Jul 2024 11:03:34 +0200
Message-ID: <3e6d433110b177d209127d34eb94876d10f52c51.1720429414.git.mail@HIDDEN>
In-Reply-To: <b9be0a44b3a7ca7e33d05ee4cefa65d8c16d871d.1720429414.git.mail@HIDDEN>
References: <b9be0a44b3a7ca7e33d05ee4cefa65d8c16d871d.1720429414.git.mail@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

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

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

Change-Id: I3a4ab85219ae71af17f43d864410fe2ac86ef214
---
 gnu/packages/python-crypto.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 78f65ccf87..b001bb3e19 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -662,7 +662,10 @@ (define-public python-pyopenssl
                 ;; PyOpenSSL runs tests against a certificate with a fixed
                 ;; expiry time.  To ensure successful builds in the future,
                 ;; set the time to roughly the release date.
-                (invoke "faketime" "2023-03-25" "pytest" "-vv" "-k"
+                (invoke #$@(if (target-64bit?)
+                               '("faketime" "2023-03-25")
+                               '())
+                        "pytest" "-vv" "-k"
                         (string-append
                          ;; This test tries to look up certificates from
                          ;; the compiled-in default path in OpenSSL, which
@@ -676,7 +679,10 @@ (define-public python-pyopenssl
                          "and not test_verify_with_time"))))))))
     (propagated-inputs (list python-cryptography))
     (inputs (list openssl))
-    (native-inputs (list libfaketime python-flaky python-pretend python-pytest))
+    (native-inputs `(,@(if (target-64bit?)
+                           (list libfaketime)
+                           '())
+                     ,@(list python-flaky python-pretend python-pytest)))
     (home-page "https://github.com/pyca/pyopenssl")
     (synopsis "Python wrapper module around the OpenSSL library")
     (description "PyOpenSSL is a high-level wrapper around a subset of the
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#71993] [PATCH core-updates 0/2] Don't use libfaketime for key package tests on 32bit systems
Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jul 2024 12:28:01 +0000
Resent-Message-ID: <handler.71993.B71993.17204416238408 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 71993
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Christopher Baines <mail@HIDDEN>
Cc: 71993 <at> debbugs.gnu.org
Received: via spool by 71993-submit <at> debbugs.gnu.org id=B71993.17204416238408
          (code B ref 71993); Mon, 08 Jul 2024 12:28:01 +0000
Received: (at 71993) by debbugs.gnu.org; 8 Jul 2024 12:27:03 +0000
Received: from localhost ([127.0.0.1]:49870 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sQnSR-0002BW-77
	for submit <at> debbugs.gnu.org; Mon, 08 Jul 2024 08:27:03 -0400
Received: from eggs.gnu.org ([209.51.188.92]:53782)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <ludo@HIDDEN>) id 1sQnSN-0002Ay-9z
 for 71993 <at> debbugs.gnu.org; Mon, 08 Jul 2024 08:27:01 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
 id 1sQnSC-0002yA-WD; Mon, 08 Jul 2024 08:26:49 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
 From; bh=SWfIskL/9ofKVuIBPPhUQYFEwqGiC5daDsJAat1UvHE=; b=mqmnak2tXBWMlCrsDFiU
 S238GY7oli76dxGIebOsYS+m1YQe68ygv/voGkYYQY8Bno60H5EjqFcMVEtmJxl6hhBR+zgi5PRf5
 mhneaaXfADG+su5aUxKpbAGY0RAWpQLHvCEUsQeCi0Y9E5jSLUOSacF1NcdUOkBLvYtBs7S3NxwNd
 j+1OwiwqnMQWWZ0wQ6TANnUBu6g3KidT+GiTfgNz4J6yJgFM8w4DH4EtUKUBN7RV1SmDZQ6Twz4zJ
 5izIrLkMFVqoZTlt2L9Lb9/kgtPIhGzVGbtWLqS63monL8k4mlTWf83HzqpVTAjdjY56uDycGoMRq
 nS0jEvj1S5HiSA==;
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
In-Reply-To: <87bk389sop.fsf@HIDDEN> (Christopher Baines's message of
 "Mon, 08 Jul 2024 10:47:02 +0200")
References: <87bk389sop.fsf@HIDDEN>
Date: Mon, 08 Jul 2024 14:26:43 +0200
Message-ID: <87frsk9iik.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

Hello!

Christopher Baines <mail@HIDDEN> skribis:

>   gnu: nss: Don't use libfaketime on 32bit systems.
>   gnu: python-pyopenssl: Don't use libfaketime on 32bit systems.

Here=E2=80=99s an alternate solution: getting closer to fixing libfaketime.
After this patch, there are still issues with the
=E2=80=98pthread_cond_timedwait=E2=80=99 tests that would probably need inv=
estigation or
just plain skipping.


--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index bc341943f02..8714086be89 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -3477,6 +3477,24 @@ (define-public libfaketime
               (substitute* "src/faketime.c"
                 (("\"date\"")
                  (format #f "~s" (search-input-file inputs "bin/date"))))))
+
+          #$@(if (target-64bit?)
+                 #~()
+                 #~((add-after 'unpack 'switch-libc-call
+                      (lambda _
+                        (substitute* "src/libfaketime.c"
+                          (("#define _GNU_SOURCE")
+                           ;; Make sure to use the 64-bit 'struct timespec' in
+                           ;; replacement functions.
+                           (string-append "#define _GNU_SOURCE\n"
+                                          "#define _FILE_OFFSET_BITS 64\n"
+                                          "#define _TIME_BITS 64\n"))
+                          (("\"__clock_gettime\"")
+                           ;; Replace '__clock_gettime64' rather than
+                           ;; '__clock_gettime64' since this is what
+                           ;; newly-built applications use.
+                           "\"__clock_gettime64\""))))))
+
           (replace 'configure
             (lambda* (#:key outputs #:allow-other-keys)
               (setenv "CC" #$(cc-for-target))
@@ -3495,8 +3513,14 @@ (define-public libfaketime
           (add-before 'check 'pre-check
             (lambda _
               (substitute* "test/functests/test_exclude_mono.sh"
-                (("/bin/bash") (which "bash"))))))))
-    (native-inputs (list perl))         ;for tests
+                (("/bin/bash") (which "bash")))
+              #$@(if (target-64bit?)
+                     #~()
+                     ;; This test uses Perl to call 'clock_gettime' and fails
+                     ;; for unclear reasons on i686-linux.
+                     #~((delete-file
+                         "test/functests/test_exclude_mono.sh"))))))))
+    (native-inputs (list perl))                   ;for tests
     (inputs (list coreutils-minimal))
     (synopsis "Fake the system time for single applications")
     (description

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable


Another option: use =E2=80=98datefudge=E2=80=99 rather than =E2=80=98libfak=
etime=E2=80=99 for those
packages.

Ludo=E2=80=99.

--=-=-=--

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#71993] [PATCH v3] gnu: libfaketime: Support compilation with glibc 2.39 on i686-linux.
Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 08 Jul 2024 12:55:02 +0000
Resent-Message-ID: <handler.71993.B71993.172044328911727 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 71993
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 71993 <at> debbugs.gnu.org
Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Received: via spool by 71993-submit <at> debbugs.gnu.org id=B71993.172044328911727
          (code B ref 71993); Mon, 08 Jul 2024 12:55:02 +0000
Received: (at 71993) by debbugs.gnu.org; 8 Jul 2024 12:54:49 +0000
Received: from localhost ([127.0.0.1]:49890 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sQntJ-000334-76
	for submit <at> debbugs.gnu.org; Mon, 08 Jul 2024 08:54:49 -0400
Received: from eggs.gnu.org ([209.51.188.92]:41290)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <ludo@HIDDEN>) id 1sQntG-00032m-KV
 for 71993 <at> debbugs.gnu.org; Mon, 08 Jul 2024 08:54:47 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
 id 1sQnt5-0007qM-Jy; Mon, 08 Jul 2024 08:54:35 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
 From; bh=IbAQo240JgAkF9YVkHf90/vpq9tnYRh1kw83wt7CM6o=; b=IeYPrB11sgLEVq+2Wzeb
 mQW6b3Kll0BmZE2srBoVKQM8uzFR0lWHRisBnxXsIYNPJ6XA5N1ulN5ZAWK200nNIVQ+GMHhXwvV1
 V8OS4nC22cvWvVv0p6Yp1aEBjyTnDBbTradl911j3HvCbDxNanIe/GTB3zL3I+0Ft2fhTBoRPsAgg
 yL9hFKF4iYND0QSgV/+Kca78TNzWmRaM+Xm+zlB9gBSuWsmohORQ/a/0vXgNj3oBLOIjxm2b9ROo6
 8spK0R4rZkxDoDwCrOApXQIgdKS5XHBxj7X3IeNXa+Q4KoOtTvBruqhm0lMdpTn1kgvYMYJhxJZb5
 VvbagJFYUFYRWg==;
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Date: Mon,  8 Jul 2024 14:54:22 +0200
Message-ID: <64156410f93a987c3b2a9ca6e8420b8502921527.1720443180.git.ludo@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <87frsk9iik.fsf@HIDDEN>
References: <87frsk9iik.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

* gnu/packages/check.scm (libfaketime)[arguments]: Add
‘switch-libc-call’ phase when not ‘target-64bit?’.
In ‘pre-check’ phase, delete ‘test_exclude_mono.sh’ on 32-bit platforms.

Change-Id: Ia4c0d1d13cdfa6028f3e11c63e76122a99a84e4d
---
 gnu/packages/check.scm | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

This updated version of the patch works for me on i686-linux.

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index bc341943f02..ee23406c86f 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -26,7 +26,7 @@
 ;;; Copyright © 2017 Nikita <nikita@HIDDEN>
 ;;; Copyright © 2015, 2017, 2018, 2020, 2021, 2023, 2024 Ricardo Wurmus <rekado@HIDDEN>
 ;;; Copyright © 2016-2022 Marius Bakke <marius@HIDDEN>
-;;; Copyright © 2017, 2018, 2020, 2021 Ludovic Courtès <ludo@HIDDEN>
+;;; Copyright © 2017-2018, 2020-2021, 2024 Ludovic Courtès <ludo@HIDDEN>
 ;;; Copyright © 2018 Fis Trivial <ybbs.daans@HIDDEN>
 ;;; Copyright © 2019, 2021 Pierre Langlois <pierre.langlois@HIDDEN>
 ;;; Copyright © 2019 Chris Marusich <cmmarusich@HIDDEN>
@@ -3477,6 +3477,32 @@ (define-public libfaketime
               (substitute* "src/faketime.c"
                 (("\"date\"")
                  (format #f "~s" (search-input-file inputs "bin/date"))))))
+
+          #$@(if (target-64bit?)
+                 #~()
+                 #~((add-after 'unpack 'switch-libc-call
+                      (lambda _
+                        (substitute* "src/libfaketime.c"
+                          (("#define _GNU_SOURCE")
+                           ;; Make sure to use the 64-bit 'struct timespec' in
+                           ;; replacement functions.
+                           (string-append "#define _GNU_SOURCE\n"
+                                          "#define _FILE_OFFSET_BITS 64\n"
+                                          "#define _TIME_BITS 64\n"))
+                          (("\"__clock_gettime\"")
+                           ;; Replace '__clock_gettime64' rather than
+                           ;; '__clock_gettime64' since this is what
+                           ;; newly-built applications use.
+                           "\"__clock_gettime64\""))
+
+                        ;; XXX: Turn off 'pthread_cond_timedwait' etc.: tests
+                        ;; related to this are failing and this feature is
+                        ;; probably not useful for the purposes of running
+                        ;; code at a fixed date.
+                        (substitute* "src/Makefile"
+                          (("-DFAKE_PTHREAD")
+                           ""))))))
+
           (replace 'configure
             (lambda* (#:key outputs #:allow-other-keys)
               (setenv "CC" #$(cc-for-target))
@@ -3495,8 +3521,14 @@ (define-public libfaketime
           (add-before 'check 'pre-check
             (lambda _
               (substitute* "test/functests/test_exclude_mono.sh"
-                (("/bin/bash") (which "bash"))))))))
-    (native-inputs (list perl))         ;for tests
+                (("/bin/bash") (which "bash")))
+              #$@(if (target-64bit?)
+                     #~()
+                     ;; XXX: This test uses Perl to call 'clock_gettime' and
+                     ;; fails for unclear reasons on i686-linux.
+                     #~((delete-file
+                         "test/functests/test_exclude_mono.sh"))))))))
+    (native-inputs (list perl))                   ;for tests
     (inputs (list coreutils-minimal))
     (synopsis "Fake the system time for single applications")
     (description

base-commit: e4da066f0029ef38f6a791f6f9d4cfdb8b39b6a3
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#71993] retitle
References: <87bk389sop.fsf@HIDDEN>
In-Reply-To: <87bk389sop.fsf@HIDDEN>
Resent-From: Christopher Baines <mail@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 09 Jul 2024 08:51:02 +0000
Resent-Message-ID: <handler.71993.B71993.172051505615133 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 71993
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: control <at> debbugs.gnu.org, 71993 <at> debbugs.gnu.org
Received: via spool by 71993-submit <at> debbugs.gnu.org id=B71993.172051505615133
          (code B ref 71993); Tue, 09 Jul 2024 08:51:02 +0000
Received: (at 71993) by debbugs.gnu.org; 9 Jul 2024 08:50:56 +0000
Received: from localhost ([127.0.0.1]:52103 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sR6Yp-0003vz-Lc
	for submit <at> debbugs.gnu.org; Tue, 09 Jul 2024 04:50:55 -0400
Received: from mira.cbaines.net ([212.71.252.8]:43924)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <mail@HIDDEN>)
 id 1sR6Yn-0003vn-KS; Tue, 09 Jul 2024 04:50:54 -0400
Received: from localhost (unknown [89.207.175.27])
 by mira.cbaines.net (Postfix) with ESMTPSA id D782F27BBE2;
 Tue,  9 Jul 2024 09:50:16 +0100 (BST)
Received: from felis (localhost [127.0.0.1])
 by localhost (OpenSMTPD) with ESMTP id 5e9d8b7a;
 Tue, 9 Jul 2024 08:50:14 +0000 (UTC)
From: Christopher Baines <mail@HIDDEN>
User-Agent: mu4e 1.12.4; emacs 29.3
Date: Tue, 09 Jul 2024 10:50:14 +0200
Message-ID: <874j8z9cft.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

retitle 71993 [core-updates] gnu: libfaketime: Support compilation with glibc 2.39 on i686-linux.
thanks

Message received at control <at> debbugs.gnu.org:

Received: (at control) by debbugs.gnu.org; 9 Jul 2024 08:50:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 09 04:50:56 2024
Received: from localhost ([127.0.0.1]:52105 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sR6Yp-0003w2-TH
	for submit <at> debbugs.gnu.org; Tue, 09 Jul 2024 04:50:56 -0400
Received: from mira.cbaines.net ([212.71.252.8]:43924)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <mail@HIDDEN>)
 id 1sR6Yn-0003vn-KS; Tue, 09 Jul 2024 04:50:54 -0400
Received: from localhost (unknown [89.207.175.27])
 by mira.cbaines.net (Postfix) with ESMTPSA id D782F27BBE2;
 Tue,  9 Jul 2024 09:50:16 +0100 (BST)
Received: from felis (localhost [127.0.0.1])
 by localhost (OpenSMTPD) with ESMTP id 5e9d8b7a;
 Tue, 9 Jul 2024 08:50:14 +0000 (UTC)
From: Christopher Baines <mail@HIDDEN>
To: control <at> debbugs.gnu.org, 71993 <at> debbugs.gnu.org
Subject: retitle
User-Agent: mu4e 1.12.4; emacs 29.3
Date: Tue, 09 Jul 2024 10:50:14 +0200
Message-ID: <874j8z9cft.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: control
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

retitle 71993 [core-updates] gnu: libfaketime: Support compilation with glibc 2.39 on i686-linux.
thanks

Last modified: Tue, 9 Jul 2024 09:00:01 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.