guix_mirror_bot pushed a commit to branch master
in repository guix.
commit e639447fc156b65a84a92d476b4d78d24cdd7788
Author: Yelninei <[email protected]>
AuthorDate: Fri Oct 24 14:55:52 2025 +0000
gnu: Use target-hurd32? to check for 32bit hurd targets.
* gnu/packages/base.scm (grep, tar, patch, diffutils, findutils): Use
target-hurd32?.
* gnu/packages/linux.scm (util-linux): Same.
Change-Id: I65c4df3483530ee395a39dd3b7462980321383dd
Signed-off-by: Ludovic Courtès <[email protected]>
---
gnu/packages/base.scm | 12 +++++-------
gnu/packages/linux.scm | 3 +--
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 70ca4f8b23..2609674319 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -138,7 +138,7 @@ command-line arguments, multiple languages, and so on.")
;; integer in 'hurd_types.defs', so this Gnulib test always fails.
#:make-flags
#~#$(if (and (not (%current-target-system))
- (string=? (%current-system) "i586-gnu"))
+ (target-hurd32?))
#~'("XFAIL_TESTS=test-year2038")
#~'())
@@ -269,8 +269,7 @@ implementation offers several extensions over the standard
utility.")
'(#:make-flags (list "TESTSUITEFLAGS= -k '!tricky time stamps'")))
(else '()))
;; XXX: 32-bit Hurd platforms don't support 64bit time_t
- ,@(if (and (target-hurd?)
- (not (target-64bit?)))
+ ,@(if (target-hurd32?)
(list #:configure-flags ''("--disable-year2038"))
'())
#:phases (modify-phases %standard-phases
@@ -346,7 +345,7 @@ differences.")
(arguments
(substitute-keyword-arguments (package-arguments patch/pinned)
((#:configure-flags flags #~'())
- (if (and (target-hurd?) (not (target-64bit?)))
+ (if (target-hurd32?)
#~(cons* "--disable-year2038"
#$flags)
flags))))
@@ -370,7 +369,7 @@ differences.")
;; integer in 'hurd_types.defs', so this Gnulib test always fails.
#:make-flags
#~#$(cond ((and (not (%current-target-system))
- (string=? (%current-system) "i586-gnu"))
+ (target-hurd32?))
#~'("XFAIL_TESTS=test-year2038"))
;; TODO: Figure out why these gnulib tests are failing.
((and (not (%current-target-system))
@@ -428,8 +427,7 @@ interactive means to merge two files.")
(arguments
`(#:configure-flags (list
;; XXX: 32-bit Hurd platforms don't support 64bit
time_t
- ,@(if (and (target-hurd?)
- (not (target-64bit?)))
+ ,@(if (target-hurd32?)
'("--disable-year2038")
'())
;; Tell 'updatedb' to write to /var.
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index edfd9308b3..c84a61adac 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3261,8 +3261,7 @@ deviation, and minimum and maximum values. It can show a
nice histogram too.")
(string-append "--with-bashcompletiondir=" #$output
"/etc/bash_completion.d")
;; XXX: 32-bit Hurd platforms don't support 64bit time_t
- #$@(if (and (target-hurd?)
- (not (target-64bit?)))
+ #$@(if (target-hurd32?)
'("--disable-year2038")
'()))
