aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-11-27 23:03:45 +0100
committerLudovic Courtès <ludo@gnu.org>2016-11-27 23:06:09 +0100
commitaa28ecc40af91d7cdff2fb3ab4ad86ad10d43ab7 (patch)
treea92c2419d7c29d5185f02c84c1921317f0602306
parentc7a70c336f11f5db2636a15372fa85a8b426fd3b (diff)
downloadpatches-aa28ecc40af91d7cdff2fb3ab4ad86ad10d43ab7.tar
patches-aa28ecc40af91d7cdff2fb3ab4ad86ad10d43ab7.tar.gz
pull: Hack to allow compilation with older Guile-SSH packages.
Reported by iyzsong@member.fsf.org (宋文武) at <https://lists.gnu.org/archive/html/guix-devel/2016-11/msg01045.html>. * build-aux/build-self.scm (build): Set 'LTDL_LIBRARY_PATH' when GUILE-SSH has a "0.9." version prefix.
-rw-r--r--build-aux/build-self.scm7
1 files changed, 7 insertions, 0 deletions
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index 485f91b4c0..cc702490df 100644
--- a/build-aux/build-self.scm
+++ b/build-aux/build-self.scm
@@ -114,6 +114,13 @@ files."
(string-append #$guile-ssh "/lib/guile/2.0/site-ccache")
%load-compiled-path)))
+ ;; XXX: The 'guile-ssh' package prior to Guix commit 92b7258 was
+ ;; broken: libguile-ssh could not be found. Work around that.
+ ;; FIXME: We want Guile-SSH 0.10.2 or later anyway.
+ #$(if (string-prefix? "0.9." (package-version guile-ssh))
+ #~(setenv "LTDL_LIBRARY_PATH" (string-append #$guile-ssh "/lib"))
+ #t)
+
(build-guix #$output #$source
#:system #$%system