summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2022-03-07 00:26:51 +0100
committerLudovic Courtès <ludo@gnu.org>2022-03-07 00:26:51 +0100
commit3ac1366648f933f7244c2d0b9926f7ba5d92a113 (patch)
tree2633dde6182d7d6fae5d00f21241e80022000ba1
parentafb9f2752315f131e4ddd44eba02eed403365085 (diff)
downloadguix-patches-3ac1366648f933f7244c2d0b9926f7ba5d92a113.tar
guix-patches-3ac1366648f933f7244c2d0b9926f7ba5d92a113.tar.gz
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.
-rw-r--r--gnu/packages/ssh.scm7
1 files changed, 7 insertions, 0 deletions
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