diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-11-18 23:48:13 +0100 |
|---|---|---|
| committer | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-12-03 08:33:13 +0100 |
| commit | 2d37f0e0715678bd4a8302f40940806f53adef20 (patch) | |
| tree | e6b93aa689a3bbc376f576b9f6d8717257483f44 /gnu/packages | |
| parent | b2a9eb5c9ef4b614948394535e0a2affc791f78c (diff) | |
| download | guix-2d37f0e0715678bd4a8302f40940806f53adef20.tar.gz guix-2d37f0e0715678bd4a8302f40940806f53adef20.zip | |
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
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/ssh.scm | 9 |
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)) |