guix-commits
[Top][All Lists]
Advanced

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

22/58: gnu: libssh: Fix [cross-]build with gcc-14 for 32bit.


From: guix-commits
Subject: 22/58: gnu: libssh: Fix [cross-]build with gcc-14 for 32bit.
Date: Sun, 24 Nov 2024 02:50:37 -0500 (EST)

janneke pushed a commit to branch hurd-team
in repository guix.

commit bdad779a644ed31a44d72ae7491726ad2229e9c3
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Mon Nov 18 23:48:13 2024 +0100

    gnu: libssh: Fix [cross-]build with gcc-14 for 32bit.
    
    * gnu/packages/ssh.scm (libssh)[arguments]: When cross-compiling to a
    32bit host, add CFLAGS to #:configure-flags to disable a breaking warning.
    
    Change-Id: Ibab7332af162aed38158a50e9b4fc288b4286922
---
 gnu/packages/ssh.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index a29a10e954..1f33259246 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2018 Manuel Graf <graf@init.at>
 ;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
 ;;; Copyright © 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
@@ -156,7 +156,12 @@ file names.
     (build-system cmake-build-system)
     (outputs '("out" "debug"))
     (arguments
-     '(#:configure-flags '("-DWITH_GCRYPT=ON")
+     `(#:configure-flags '("-DWITH_GCRYPT=ON"
+                           ,@(if (and (%current-target-system) 
(target-x86-32?))
+                                 (list (string-append
+                                        "-DCMAKE_C_FLAGS=-g -O2"
+                                        " -Wno-incompatible-pointer-types"))
+                                 '()))
 
        ;; TODO: Add 'CMockery' and '-DWITH_TESTING=ON' for the test suite.
        #:tests? #f))



reply via email to

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