branch master updated: gnu: libssh: Fix cross-compiling to 32-bit architectures.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 93e1586116 gnu: libssh: Fix cross-compiling to 32-bit architectures.
93e1586116 is described below

commit 93e1586116f39a30ba1fcb67bd839a43533dfaf4
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Dec 10 09:09:31 2024 +0200

    gnu: libssh: Fix cross-compiling to 32-bit architectures.
    
    * gnu/packages/ssh.scm (libssh)[arguments]: When cross-compiling to any
    32-bit architecture add a configure-flag to only warn about incompatible
    pointer types.
    
    Change-Id: I3ae71d885bd30a6ba51886824f6dee688538f2f2
---
 gnu/packages/ssh.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index c04463ca32..5181273407 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2012-2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021, 2022 Efraim Flashner 
<efraim@flashner.co.il>
+;;; Copyright © 2015, 2016, 2018-2022, 2024 Efraim Flashner 
<efraim@flashner.co.il>
 ;;; Copyright © 2016, 2019 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016, 2021, 2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2016 Christine Lemmer-Webber <cwebber@dustycloud.org>
@@ -159,7 +159,8 @@ file names.
     (outputs '("out" "debug"))
     (arguments
      `(#:configure-flags '("-DWITH_GCRYPT=ON"
-                           ,@(if (and (%current-target-system) 
(target-x86-32?))
+                           ,@(if (and (%current-target-system)
+                                      (not (target-64bit?)))
                                  (list (string-append
                                         "-DCMAKE_C_FLAGS=-g -O2"
                                         " -Wno-incompatible-pointer-types"))