summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDariqq <dariqq@posteo.net>2026-01-19 08:54:13 +0000
committerRutherther <rutherther@ditigal.xyz>2026-01-25 21:31:01 +0100
commitef24686b208234ed74e93b139db1564030fbb78b (patch)
treeddbcc9f74968807bfa1cd6f19b695a11918b3316
parent817ff57604cb340f26147b2ff328e358fb24df4c (diff)
gnu: unity-test: Add option for supporting 64bit integers.
* gnu/packages/check.scm (unity-test): Add patch and enable 64bit integer option. * gnu/packages/patches/unity-test-support-int64.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register patch- Change-Id: Ib432c9112c3476e03f7607259c2dfe00ef98a90c Signed-off-by: Ludovic Courtès <ludo@gnu.org> Fixes: guix/guix#5673 Merges: #5675 Signed-off-by: Rutherther <rutherther@ditigal.xyz>
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/check.scm6
-rw-r--r--gnu/packages/patches/unity-test-support-int64.patch47
3 files changed, 52 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index da92f92d939..99d38943214 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2434,6 +2434,7 @@ dist_patch_DATA = \
2434 %D%/packages/patches/uftrace-fix-tests.patch \ 2434 %D%/packages/patches/uftrace-fix-tests.patch \
2435 %D%/packages/patches/ultrastar-deluxe-no-freesans.patch \ 2435 %D%/packages/patches/ultrastar-deluxe-no-freesans.patch \
2436 %D%/packages/patches/unity-test-set-subdir-correctly.patch \ 2436 %D%/packages/patches/unity-test-set-subdir-correctly.patch \
2437 %D%/packages/patches/unity-test-support-int64.patch \
2437 %D%/packages/patches/ungoogled-chromium-extension-search-path.patch \ 2438 %D%/packages/patches/ungoogled-chromium-extension-search-path.patch \
2438 %D%/packages/patches/ungoogled-chromium-RUNPATH.patch \ 2439 %D%/packages/patches/ungoogled-chromium-RUNPATH.patch \
2439 %D%/packages/patches/ungoogled-chromium-system-nspr.patch \ 2440 %D%/packages/patches/ungoogled-chromium-system-nspr.patch \
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 9027f9ec2e9..520f601982f 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -3410,11 +3410,13 @@ portable to just about any platform.")
3410 (file-name (git-file-name name version)) 3410 (file-name (git-file-name name version))
3411 (sha256 3411 (sha256
3412 (base32 "1s0jj9f2zav49mn9ib90idcmb6hq93aczbqysn5hj6binjmrnjw3")) 3412 (base32 "1s0jj9f2zav49mn9ib90idcmb6hq93aczbqysn5hj6binjmrnjw3"))
3413 (patches (search-patches "unity-test-set-subdir-correctly.patch")))) 3413 (patches (search-patches "unity-test-set-subdir-correctly.patch"
3414 "unity-test-support-int64.patch"))))
3414 (build-system meson-build-system) 3415 (build-system meson-build-system)
3415 (arguments 3416 (arguments
3416 (list #:configure-flags 3417 (list #:configure-flags
3417 #~(list "-Dsupport_double=true") 3418 #~(list "-Dsupport_double=true"
3419 "-Dsupport_int64=true")
3418 #:phases 3420 #:phases
3419 #~(modify-phases %standard-phases 3421 #~(modify-phases %standard-phases
3420 (add-after 'patch-source-shebangs 'patch-more-shebangs 3422 (add-after 'patch-source-shebangs 'patch-more-shebangs
diff --git a/gnu/packages/patches/unity-test-support-int64.patch b/gnu/packages/patches/unity-test-support-int64.patch
new file mode 100644
index 00000000000..596a4ed5481
--- /dev/null
+++ b/gnu/packages/patches/unity-test-support-int64.patch
@@ -0,0 +1,47 @@
1Upstream status: https://github.com/ThrowTheSwitch/Unity/pull/823
2
3From 4d35efd1bc5ecfa67d73bf81e64ba54c08ed5318 Mon Sep 17 00:00:00 2001
4From: Dariqq <77271900+Dariqq@users.noreply.github.com>
5Date: Tue, 20 Jan 2026 18:10:14 +0000
6Subject: [PATCH] meson: Add option for UNITY_SUPPORT_64
7
8---
9 meson.build | 5 +++++
10 meson_options.txt | 1 +
11 2 files changed, 6 insertions(+)
12
13diff --git a/meson.build b/meson.build
14index 6585129..633beb3 100644
15--- a/meson.build
16+++ b/meson.build
17@@ -26,6 +26,7 @@ project('unity', 'c',
18 build_fixture = get_option('extension_fixture')
19 build_memory = get_option('extension_memory')
20 support_double = get_option('support_double')
21+support_int64 = get_option('support_int64')
22
23 unity_args = []
24 unity_src = []
25@@ -48,6 +49,10 @@ if support_double
26 unity_args += '-DUNITY_INCLUDE_DOUBLE'
27 endif
28
29+if support_int64
30+ unity_args += '-DUNITY_SUPPORT_64'
31+endif
32+
33 unity_lib = static_library(meson.project_name(),
34 sources: unity_src,
35 c_args: unity_args,
36diff --git a/meson_options.txt b/meson_options.txt
37index 8e66784..d8ab7a7 100644
38--- a/meson_options.txt
39+++ b/meson_options.txt
40@@ -1,3 +1,4 @@
41 option('extension_fixture', type: 'boolean', value: 'false', description: 'Whether to enable the fixture extension.')
42 option('extension_memory', type: 'boolean', value: 'false', description: 'Whether to enable the memory extension.')
43 option('support_double', type: 'boolean', value: 'false', description: 'Whether to enable double precision floating point assertions.')
44+option('support_int64', type: 'boolean', value: false, description: 'Whether to enable support for 64bit integers. false means autodetect.')
45--
462.52.0
47