~ruther/guix-local

ef24686b208234ed74e93b139db1564030fbb78b — Dariqq a month ago 817ff57
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>
3 files changed, 52 insertions(+), 2 deletions(-)

M gnu/local.mk
M gnu/packages/check.scm
A gnu/packages/patches/unity-test-support-int64.patch
M gnu/local.mk => gnu/local.mk +1 -0
@@ 2434,6 2434,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/uftrace-fix-tests.patch			\
  %D%/packages/patches/ultrastar-deluxe-no-freesans.patch		\
  %D%/packages/patches/unity-test-set-subdir-correctly.patch		\
  %D%/packages/patches/unity-test-support-int64.patch		\
  %D%/packages/patches/ungoogled-chromium-extension-search-path.patch	\
  %D%/packages/patches/ungoogled-chromium-RUNPATH.patch		\
  %D%/packages/patches/ungoogled-chromium-system-nspr.patch	\

M gnu/packages/check.scm => gnu/packages/check.scm +4 -2
@@ 3410,11 3410,13 @@ portable to just about any platform.")
              (file-name (git-file-name name version))
              (sha256
               (base32 "1s0jj9f2zav49mn9ib90idcmb6hq93aczbqysn5hj6binjmrnjw3"))
              (patches (search-patches "unity-test-set-subdir-correctly.patch"))))
              (patches (search-patches "unity-test-set-subdir-correctly.patch"
                                       "unity-test-support-int64.patch"))))
    (build-system meson-build-system)
    (arguments
      (list #:configure-flags
            #~(list "-Dsupport_double=true")
            #~(list "-Dsupport_double=true"
                    "-Dsupport_int64=true")
            #:phases
            #~(modify-phases %standard-phases
                (add-after 'patch-source-shebangs 'patch-more-shebangs

A gnu/packages/patches/unity-test-support-int64.patch => gnu/packages/patches/unity-test-support-int64.patch +47 -0
@@ 0,0 1,47 @@
Upstream status: https://github.com/ThrowTheSwitch/Unity/pull/823

From 4d35efd1bc5ecfa67d73bf81e64ba54c08ed5318 Mon Sep 17 00:00:00 2001
From: Dariqq <77271900+Dariqq@users.noreply.github.com>
Date: Tue, 20 Jan 2026 18:10:14 +0000
Subject: [PATCH] meson: Add option for UNITY_SUPPORT_64

---
 meson.build       | 5 +++++
 meson_options.txt | 1 +
 2 files changed, 6 insertions(+)

diff --git a/meson.build b/meson.build
index 6585129..633beb3 100644
--- a/meson.build
+++ b/meson.build
@@ -26,6 +26,7 @@ project('unity', 'c',
 build_fixture = get_option('extension_fixture')
 build_memory = get_option('extension_memory')
 support_double = get_option('support_double')
+support_int64 = get_option('support_int64')
 
 unity_args = []
 unity_src = []
@@ -48,6 +49,10 @@ if support_double
   unity_args += '-DUNITY_INCLUDE_DOUBLE'
 endif
 
+if support_int64
+  unity_args += '-DUNITY_SUPPORT_64'
+endif
+
 unity_lib = static_library(meson.project_name(),
   sources: unity_src,
   c_args: unity_args,
diff --git a/meson_options.txt b/meson_options.txt
index 8e66784..d8ab7a7 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,4 @@
 option('extension_fixture', type: 'boolean', value: 'false', description: 'Whether to enable the fixture extension.')
 option('extension_memory', type: 'boolean', value: 'false', description: 'Whether to enable the memory extension.')
 option('support_double', type: 'boolean', value: 'false', description: 'Whether to enable double precision floating point assertions.')
+option('support_int64', type: 'boolean', value: false, description: 'Whether to enable support for 64bit integers. false means autodetect.')
-- 
2.52.0