01/01: pull: Hack to allow compilation with older Guile-SSH packages.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit aa28ecc40af91d7cdff2fb3ab4ad86ad10d43ab7
Author: Ludovic Courtès <address@hidden>
Date:   Sun Nov 27 23:03:45 2016 +0100

    pull: Hack to allow compilation with older Guile-SSH packages.
    
    Reported by address@hidden (宋文武)
    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.
---
 build-aux/build-self.scm |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index 485f91b..cc70249 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