guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 3e9338b923912773db46277e98e14462d4a3fb34
Author: Dariqq <[email protected]>
AuthorDate: Sun Jan 18 08:38:31 2026 +0000
gnu: Use (target-32bit?) to test for 32bit targets.
* gnu/packages/*.scm: Replace usage of target-64bit? when actually testing
for
32bit targets.
* guix/utils.scm (target-hurd32?). Same.
Change-Id: If3ed2b82a1229b72b07fafc694eedc14080e5a04
Signed-off-by: Ludovic Courtès <[email protected]>
Merges: #5710
---
gnu/packages/audio.scm | 2 +-
gnu/packages/base.scm | 2 +-
gnu/packages/check.scm | 6 +++---
gnu/packages/embedded.scm | 2 +-
gnu/packages/freedesktop.scm | 6 +++---
gnu/packages/game-development.scm | 2 +-
gnu/packages/gnome.scm | 2 +-
gnu/packages/golang-web.scm | 4 ++--
gnu/packages/golang-xyz.scm | 2 +-
gnu/packages/graphics.scm | 8 ++++----
gnu/packages/haskell-xyz.scm | 6 +++---
gnu/packages/julia-xyz.scm | 34 +++++++++++++++++-----------------
gnu/packages/machine-learning.scm | 2 +-
gnu/packages/mail.scm | 2 +-
gnu/packages/node.scm | 2 +-
gnu/packages/parallel.scm | 4 ++--
gnu/packages/python-xyz.scm | 4 ++--
gnu/packages/version-control.scm | 6 +++---
guix/utils.scm | 2 +-
19 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 62700d3c87..7c88b21e9d 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -7260,7 +7260,7 @@ default and preferred audio driver but also supports
native drivers like ALSA.")
;; yabridge-host-32.exe and yabridge-host-32.exe.so. On
;; 64bit system do not enable it since gcc does not
;; support multilib.
- (if (not #$(target-64bit?)) "-Dbitbridge=true" '()))
+ (if #$(target-32bit?) "-Dbitbridge=true" '()))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'copy-vst3sdk
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 31ad20e2ee..21cc04772a 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -273,7 +273,7 @@ implementation offers several extensions over the standard
utility.")
;; https://lists.gnu.org/archive/html/bug-tar/2021-10/msg00007.html
;; tar-1.34 isn't aware of 64-bit time_t and upstream suggests
;; skipping the test for this release on 32-bit systems.
- ((not (target-64bit?))
+ ((target-32bit?)
'(#:make-flags (list "TESTSUITEFLAGS= -k '!tricky time stamps'")))
(else '()))
;; XXX: 32-bit Hurd platforms don't support 64bit time_t
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index d1403b3682..e57cdaf3a4 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -3408,13 +3408,13 @@ with a focus on working with embedded toolchains.")
(("\"date\"")
(format #f "~s" (search-input-file inputs "bin/date"))))))
- #$@(if (target-64bit?)
- #~()
+ #$@(if (target-32bit?)
#~((add-after 'unpack 'apply-32bit-patch
(lambda _
(let ((patch #$(local-file
(search-patch "libfaketime-32bit.patch"))))
- (invoke "patch" "--force" "-p1" "-i" patch))))))
+ (invoke "patch" "--force" "-p1" "-i" patch)))))
+ #~())
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index bd255bec4a..c5f73d9485 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -962,7 +962,7 @@ SEGGER J-Link and compatible devices.")
;; XXX All but 1 SSL tests fail (tries connecting to Google
;; servers).
(delete-file "tests/ssl.test")))
- #$@(if (not (target-64bit?))
+ #$@(if (target-32bit?)
#~((add-after 'unpack 'delete-failing-tests/32bit
(lambda _
(delete-file "tests/file.test"))))
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 5434714275..502288173f 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -653,14 +653,14 @@ freedesktop.org project.")
;; Meson target anyway.
#:build-type "release"
#:phases
- ,@(if (target-64bit?)
- `(%standard-phases)
+ ,@(if (target-32bit?)
`((modify-phases %standard-phases
;; Backported from a commit after the 1.29.0 release.
(add-after 'unpack 'correct-value-type-in-atou64_test
(lambda _
(substitute* "test/test-utils.c"
- (("unsigned long val") "uint64_t val")))))))))
+ (("unsigned long val") "uint64_t val"))))))
+ `(%standard-phases))))
(native-inputs
(append (list check pkg-config python-minimal-wrapper python-pytest)
(if (%current-target-system)
diff --git a/gnu/packages/game-development.scm
b/gnu/packages/game-development.scm
index ba68f24841..42229437bf 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -3684,7 +3684,7 @@ utilities frequently used in roguelikes.")
(list #:tests? #f ; No tests.
#:configure-flags
;; Needed to fix 32bit builds.
- #~(if (not #$(target-64bit?))
+ #~(if #$(target-32bit?)
(list "-DCMAKE_CXX_FLAGS=-D_FILE_OFFSET_BITS=64")
'())
#:phases
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a42f6029ec..8e359b5033 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9694,7 +9694,7 @@ easy, safe, and automatic.")
(search-input-file inputs "bin/bash")))))
(add-after 'unpack 'disable-failing-tests
(lambda _
- #$@(if (not (target-64bit?))
+ #$@(if (target-32bit?)
;; On 32-bit systems, the far away dates are incorrect,
;; and the floats are not parsed exactly.
'((substitute*
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index f812263d3b..e343dee884 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -11380,7 +11380,7 @@ Border Gateway Protocol}} implementation.")
;; cannot parse column object json: cannot unmarshal
;; number 4294967295 into Go struct field .type of
;; type int
- #$@(if (not (target-64bit?))
+ #$@(if (target-32bit?)
#~("TestCheckIndexes.*"
"TestClientServer.*"
"TestModelUpdates.*"
@@ -11406,7 +11406,7 @@ Border Gateway Protocol}} implementation.")
(lambda* (#:key tests? import-path #:allow-other-keys)
(with-directory-excursion (string-append "src/" import-path)
(delete-file-recursively "example"))))
- #$@(if (not (target-64bit?))
+ #$@(if (target-32bit?)
;; cannot use 4294967295 (untyped int constant) as int value
;; in assignment (overflows)
#~((add-after 'unpack 'remove-problematic-test-files
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 394df256f7..0cdcda72a5 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -26337,7 +26337,7 @@ pick one that suits you.")
#:test-flags
;; Tests fail on non 64bit systems: unexpected error: invalid index:
;; value must be a whole number, between -2147483648 and 2147483647.
- #~(list #$@(if (not (target-64bit?)) '("-skip" "TestElement") '()))))
+ #~(list #$@(if (target-32bit?) '("-skip" "TestElement") '()))))
(native-inputs
(list go-github-com-google-go-cmp))
(propagated-inputs
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index e2a9920fe2..47b1aadf36 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1576,8 +1576,7 @@ graphics.")
"src/test/OpenEXRCoreTest/main.cpp")
(("/var/tmp")
"/tmp"))))
- #$@(if (target-64bit?)
- #~()
+ #$@(if (target-32bit?)
#~((add-after 'patch-test-directory 'disable-broken-tests
(lambda _
;; Disable tests that fail at least on i686-linux.
@@ -1598,7 +1597,8 @@ graphics.")
(("TEST\\( testB44ACompression,
\"core_compression\" \\);")
"")
(("TEST \\(testOptimizedInterleavePatterns,
\"basic\"\\);")
- ""))))))
+ "")))))
+ #~())
#$@(if (target-aarch64?)
#~((add-after 'patch-test-directory
'disable-broken-aarch64-tests
;; Disable tests known to fail on aarch64. Remove
once
@@ -1657,7 +1657,7 @@ with strong support for multi-part, multi-channel use
cases.")
all
"set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT
15000)")))
#t))
- ,@(if (not (target-64bit?))
+ ,@(if (target-32bit?)
`((add-after 'change-directory 'disable-broken-test
(lambda _
(substitute* "IlmImfTest/main.cpp"
diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 8e8916d931..5205d2820f 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -801,8 +801,7 @@ than @code{base-compat}, which has no dependencies.")
(base32 "00332i4n98gh06x8ii4p8mhjpq0ch1bdan9hxmdblxpgk8j7xdvz"))))
(build-system haskell-build-system)
(arguments
- (if (target-64bit?)
- '()
+ (if (target-32bit?)
(list #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-for-32-bit-system
@@ -811,7 +810,8 @@ than @code{base-compat}, which has no dependencies.")
#$(local-file
(search-patch "ghc-basement-fix-32-bit.patch")))
- (invoke "patch" "-p1" "--force" "-i" patch)))))))
+ (invoke "patch" "-p1" "--force" "-i" patch)))))
+ '()))
(properties '((upstream-name . "basement")))
(home-page "https://github.com/haskell-foundation/foundation#readme";)
(synopsis "Basic primitives for Foundation starter pack")
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index d888c7d52a..79bb4fac48 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -740,13 +740,13 @@ calculating corresponding shifts.")
(arguments
(list
#:phases
- (if (target-64bit?)
- #~%standard-phases
+ (if (target-32bit?)
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-tests-int32-i686
(lambda _
(substitute* "test/test_blockarrays.jl"
- (("Int64") "Int32"))))))))
+ (("Int64") "Int32")))))
+ #~%standard-phases)))
(propagated-inputs
(list julia-arraylayouts
julia-fillarrays))
@@ -1416,12 +1416,12 @@ of morphisms.")
(substitute* "Project.toml"
(("55351af7-c7e9-48d6-89ff-24e801d99491")
"6b7a57c9-7cc1-4fdf-b7f5-e857abae3636"))))
- #$@(if (target-64bit?)
- '()
+ #$@(if (target-32bit?)
'((add-after 'unpack 'fix-tests-int32-i686
(lambda _
(substitute* "test/runtests.jl"
- (("Int64") "Int32")))))))))
+ (("Int64") "Int32")))))
+ '()))))
(propagated-inputs
(list julia-crayons
julia-expronicon
@@ -1888,7 +1888,7 @@ dictionaries in Julia, for improved productivity and
performance.")
(("test dist\\(y, x") "test_nowarn dist(y, x")
(("test dist\\(z, x") "test_nowarn dist(z, x")
(("test dist\\(z, y") "test_nowarn dist(z, y"))
- #$@(if (not (target-64bit?))
+ #$@(if (target-32bit?)
;; A little too much precision
;; Evaluated: 1.8839055991209719 === 1.8839055991209717
`((substitute* "test/test_dists.jl"
@@ -2872,12 +2872,12 @@ matrices the Schur form is often more useful.")
(substitute* "test/runtests.jl"
(("@testset.*MetaT and heterogeneous data.*" all)
(string-append all "return\n")))))
- #$@(if (target-64bit?)
- '()
+ #$@(if (target-32bit?)
'((add-after 'unpack 'fix-tests-int32-i686
(lambda _
(substitute* "test/runtests.jl"
- (("Int64") "Int32")))))))))
+ (("Int64") "Int32")))))
+ '()))))
(propagated-inputs
(list julia-itertools
julia-staticarrays
@@ -4097,13 +4097,13 @@ equations in string literals in the Julia language.")
(arguments
(list
#:phases
- (if (target-64bit?)
- #~%standard-phases
+ (if (target-32bit?)
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-tests-int32-i686
(lambda _
(substitute* "test/multests.jl"
- (("Int64") "Int32"))))))))
+ (("Int64") "Int32")))))
+ #~%standard-phases)))
(propagated-inputs
(list julia-aqua
julia-arraylayouts
@@ -4371,7 +4371,7 @@ by @code{NTuples} in Julia.")
(substitute* "test/runtests.jl"
((".*@test_throws ErrorException b.*") ""))
- (when #$(not (target-64bit?))
+ (when #$(target-32bit?)
(substitute* "test/runtests.jl"
(("Int64") "Int32"))))))))
(propagated-inputs
@@ -6770,14 +6770,14 @@ with ANSI escape sequences.")
(arguments
(list
#:phases
- (if (target-64bit?)
- #~%standard-phases
+ (if (target-32bit?)
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-tests-int32-i686
(lambda _
(substitute* '("src/utils.jl"
"test/runtests.jl")
- (("Int64") "Int32"))))))))
+ (("Int64") "Int32")))))
+ #~%standard-phases)))
(propagated-inputs
(list julia-adapt
julia-dataapi
diff --git a/gnu/packages/machine-learning.scm
b/gnu/packages/machine-learning.scm
index edd8528d5a..7f70b4975f 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -982,7 +982,7 @@ independently to be able to run a LLaMA model.")
(("\"/bin/sh\"")
(string-append
"\"" (search-input-file inputs "/bin/sh") "\"")))))
- #$@(if (not (target-64bit?))
+ #$@(if (target-32bit?)
'((add-after 'unpack 'skip-failing-tests
(lambda _
;; 32-bit system
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index dee1644ad2..2436e57f11 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -4596,7 +4596,7 @@ extension.")
lsof openssl))
(inputs
(append
- (if (not (target-64bit?))
+ (if (target-32bit?)
;; Required by test t/pop3d.t, otherwise fails with
;; “sizeof(off_t)=8 requires File::FcntlLock”.
(list perl-file-fcntllock)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 1e460f8db5..99f8843f08 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -870,7 +870,7 @@ source files.")
;; https://github.com/nodejs/node/issues/45906
;; This test depends on 64-bit time_t so skipping on 32-bit
systems.
- ,@(if (not (target-64bit?))
+ ,@(if (target-32bit?)
'((delete-file "test/parallel/test-fs-utimes-y2K38.js")
(delete-file
"test/parallel/test-debugger-heap-profiler.js"))
diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index a29428c769..2d5ddfc1a9 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -43,7 +43,7 @@
#:use-module (guix build-system python)
#:use-module (guix build-system pyproject)
#:use-module ((guix licenses) #:prefix license:)
- #:use-module ((guix utils) #:select (target-64bit?))
+ #:use-module ((guix utils) #:select (target-32bit?))
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (guix gexp)
@@ -285,7 +285,7 @@ when jobs finish.")
;; 32-bit support is marked as deprecated and needs to be
;; explicitly enabled.
- #$@(if (target-64bit?) '() '("--enable-deprecated")))
+ #$@(if (target-32bit?) '("--enable-deprecated") '()))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-plugin-linker-flags
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 25c6875f72..497230b1c1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10731,7 +10731,7 @@ For some datatypes the overhead can be reduced by using
khash by factor 4-8.")
"complex_numbers_cpp"
;; This test fails when running on 24 cores.
"cpp_stl_conversion"
- #$@(if (not (target-64bit?))
+ #$@(if (target-32bit?)
;; XXX: On 32-bit architectures, running the
;; parallel tests fails on many-core systems.
;; See:
<https://github.com/cython/cython/issues/2807>.
@@ -10792,7 +10792,7 @@ writing C extensions for Python as easy as Python
itself.")
;; XXX: On 32-bit architectures, running the parallel tests
;; fails on many-core systems, see
;; <https://github.com/cython/cython/issues/2807>.
- #$@(if (not (target-64bit?))
+ #$@(if (target-32bit?)
#~("-x" "run.parallel")
#~())
#$@(if (system-hurd?)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 7a03465801..272f837cb9 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1203,9 +1203,9 @@ other git-like projects such as @code{libgit2}.")
"-DREGEX_BACKEND=pcre2"
"-DUSE_HTTP_PARSER=system"
"-DUSE_SSH=ON" ; cmake fails to find libssh if this is
missing
- ,@(if (target-64bit?)
- '()
- '("-DCMAKE_C_FLAGS=-D_FILE_OFFSET_BITS=64"))))
+ ,@(if (target-32bit?)
+ '("-DCMAKE_C_FLAGS=-D_FILE_OFFSET_BITS=64")
+ '())))
#:phases
(modify-phases %standard-phases
;; Run checks more verbosely, unless we are cross-compiling.
diff --git a/guix/utils.scm b/guix/utils.scm
index 6bf3a31743..adb5fa2ff6 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -751,7 +751,7 @@ a character other than '@'."
(%current-system))))
"Does TARGET represent the 32bit GNU(/Hurd) system?"
(and (target-hurd? target)
- (not (target-64bit? target))))
+ (target-32bit? target)))
(define* (target-hurd64? #:optional (target (or (%current-target-system)
(%current-system))))
