guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/03: gnu: l2md: Fix build on 32-bit systems.


From: guix-commits
Subject: 02/03: gnu: l2md: Fix build on 32-bit systems.
Date: Tue, 27 Feb 2024 01:28:31 -0500 (EST)

efraim pushed a commit to branch master
in repository guix.

commit 5bf912330bda32742b651aa8bbdbebd7dee0dc5c
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Feb 27 08:22:54 2024 +0200

    gnu: l2md: Fix build on 32-bit systems.
    
    * gnu/packages/mail.scm (l2md)[source]: Add snippet to gate macOS build
    fix to only apply when building for Apple devices.
    
    Change-Id: Id303a89ec78ce160cfb6ebed232a841c8283e812
---
 gnu/packages/mail.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index b2a2e247a2..9688c3624e 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
 ;;; Copyright © 2015, 2016, 2018 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2015-2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015-2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Christine Lemmer-Webber <cwebber@dustycloud.org>
 ;;; Copyright © 2016 Al McElrath <hello@yrns.org>
 ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari 
<leo@famulari.name>
@@ -4217,7 +4217,15 @@ related tools to process winmail.dat files.")
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "1hfbngwdavdhw5ghnadmi0djg2yrr0wrkv15jdd9wcqh9h6mxy8z"))))
+          (base32 "1hfbngwdavdhw5ghnadmi0djg2yrr0wrkv15jdd9wcqh9h6mxy8z"))
+         (snippet
+          #~(begin (use-modules (guix build utils))
+                   ;; Don't try to redefine loff_t.
+                   (substitute* "utils.c"
+                     (("typedef off_t loff_t;")
+                      (string-append "#ifdef __APPLE__\n"
+                                     "typedef off_t loff_t;\n"
+                                     "#endif\n")))))))
       (build-system gnu-build-system)
       (inputs
        (list libgit2))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]