From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id yEtWLEDqi2YVCAEAqHPOHw:P1 (envelope-from ) for ; Mon, 08 Jul 2024 13:31:44 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id yEtWLEDqi2YVCAEAqHPOHw (envelope-from ) for ; Mon, 08 Jul 2024 15:31:44 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=IeYPrB11; 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=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720445504; 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: content-transfer-encoding:content-transfer-encoding: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:dkim-signature; bh=IbAQo240JgAkF9YVkHf90/vpq9tnYRh1kw83wt7CM6o=; b=Zqi48zw406nl3Ici50mC6sGIMRBgWRAfx5YCdS8KDWIZK3gbItVMy2ZPVX3qWmhg14u+Sg RCfi3NcW0Slv1Mb67MFg2byhVQBCT8zHDdEdli9P5UJe6LcP6PovUPlEsuL/3WhlO5mGn7 krZyua3OPfFIKBaP3qztgGLd8vDfmMVJuFCJcPMZ7Yb2GsfpaSKND/aFgTRxQY42rJsAzg RNdKcddKC+hOKZMM4UduEFJAbLPq7evt6fhcBx0XwahIy4hPjc3JgGWNOIvVlfUoeqDpz2 JZQVm8I2R42KyS5+pYBtiNHXBBR0lg5TsYIQJh8Drb03vMAgMufg69JLIAPUCA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=IeYPrB11; 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=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720445504; a=rsa-sha256; cv=none; b=Nr+wZ1BhdvHnsqgjR/6tFbds3RaT8PVvTJeYQXu/MaUxf2VpRP4P2q3buSGpmDR8T9vBiF id0A7+wHPG5YwE5cIvsrsYXV9/F1iGbCuqtkYkEbrDJiHfHtYYbBnKOjc8IQ9Xnod2vybg NMSXd3X9bc6itwsu29DGFYL6bG2u8ZA/CzQ33DH0FYuYg7Cp064DVoQ5YgDntC+zUpsURB jksjCjWeaw/0a+jTZtGd9yRYWLWC8u2tQYIzdvAhgl2xjawVSIqJikANUsKKXsVASpKC01 BpucOZVZhBcXLXmQDOxeZHYSCHpETB7Ag3vn7vVSxHeqQqI0dCK9Tm0ja6KkRw== 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 855BD13D24 for ; Mon, 8 Jul 2024 15:31:43 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQntT-0000ef-3V; Mon, 08 Jul 2024 08:54:59 -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 1sQntR-0000eT-Ip for guix-patches@gnu.org; Mon, 08 Jul 2024 08:54: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 1sQntR-0007rZ-AK for guix-patches@gnu.org; Mon, 08 Jul 2024 08:54:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sQntW-00033s-59 for guix-patches@gnu.org; Mon, 08 Jul 2024 08:55:02 -0400 X-Loop: help-debbugs@gnu.org 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?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jul 2024 12:55: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 Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 71993-submit@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 ) id 1sQntJ-000334-76 for submit@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 ) id 1sQntG-00032m-KV for 71993@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 ) 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?= Date: Mon, 8 Jul 2024 14:54:22 +0200 Message-ID: <64156410f93a987c3b2a9ca6e8420b8502921527.1720443180.git.ludo@gnu.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <87frsk9iik.fsf@gnu.org> References: <87frsk9iik.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Migadu-Queue-Id: 855BD13D24 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -4.79 X-Spam-Score: -4.79 X-TUID: x0WLZeR+EUvF * 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 ;;; Copyright © 2015, 2017, 2018, 2020, 2021, 2023, 2024 Ricardo Wurmus ;;; Copyright © 2016-2022 Marius Bakke -;;; Copyright © 2017, 2018, 2020, 2021 Ludovic Courtès +;;; Copyright © 2017-2018, 2020-2021, 2024 Ludovic Courtès ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2019, 2021 Pierre Langlois ;;; Copyright © 2019 Chris Marusich @@ -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