guix-commits
[Top][All Lists]
Advanced

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

branch master updated: gnu: guile-ssh: Support cross-compilation.


From: guix-commits
Subject: branch master updated: gnu: guile-ssh: Support cross-compilation.
Date: Sun, 06 Mar 2022 18:28:53 -0500

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

civodul pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 3ac1366648 gnu: guile-ssh: Support cross-compilation.
3ac1366648 is described below

commit 3ac1366648f933f7244c2d0b9926f7ba5d92a113
Author: Ludovic Court├Ęs <ludo@gnu.org>
AuthorDate: Mon Mar 7 00:26:51 2022 +0100

    gnu: guile-ssh: Support cross-compilation.
    
    Cross-compilation broke with the update to 0.15.1 in
    eabc6af9b8b14bd629544e54bc9c9afa2d0dcd85.  'guile-snarf' would invoke
    cpp instead of TRIPLET-cpp, which would thus fail to find libssh
    headers.
    
    * gnu/packages/ssh.scm (guile-ssh)[arguments]: Add
    'support-cross-compilation' phase.
---
 gnu/packages/ssh.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 9895cb24af..8a61b6e97a 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -328,6 +328,13 @@ Additionally, various channel-specific options can be 
negotiated.")
        #:configure-flags '("--disable-static")
 
        #:phases (modify-phases %standard-phases
+                  (add-before 'bootstrap 'support-cross-compilation
+                    (lambda _
+                      ;; Support cross-compilation:
+                      ;; 
<https://github.com/artyom-poptsov/guile-ssh/issues/30>.
+                      (substitute* "libguile-ssh/Makefile.am"
+                        (("\\$\\(guile_snarf\\)")
+                         "CPP=\"$(CPP)\" $(guile_snarf)"))))
                   (add-before 'build 'fix-libguile-ssh-file-name
                     (lambda* (#:key outputs #:allow-other-keys)
                       ;; Build and install libguile-ssh.so so that we can use



reply via email to

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