From 5cbb346385201fb6fce1057a13a49c7977e9dd34 Mon Sep 17 00:00:00 2001 Message-ID: <5cbb346385201fb6fce1057a13a49c7977e9dd34.1721522810.git.zhengjunjie@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 glibc 2.39 on i686-linux." This reverts commit 127f1842fb037cc5acfc5406e373ccd723127732. --- 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 --- 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, 2024 Ludovic Courtès +;;; Copyright © 2017, 2018, 2020, 2021 Ludovic Courtès ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2019, 2021 Pierre Langlois ;;; Copyright © 2019 Chris Marusich @@ -3478,32 +3478,6 @@ (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)) @@ -3522,14 +3496,8 @@ (define-public libfaketime (add-before 'check 'pre-check (lambda _ (substitute* "test/functests/test_exclude_mono.sh" - (("/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 + (("/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 -- 2.45.2