summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanneke Nieuwenhuizen <janneke@gnu.org>2024-11-18 23:48:13 +0100
committerJanneke Nieuwenhuizen <janneke@gnu.org>2024-11-24 08:20:43 +0100
commitbdad779a644ed31a44d72ae7491726ad2229e9c3 (patch)
tree3e7b09b0277c9130ac1825eb20c5183906a3350b
parent8a26c747401226b6e942ab890fe2e605b6bd8680 (diff)
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
-rw-r--r--gnu/packages/ssh.scm9
1 files 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))