From ea52a52d7c635e0fed70903c720a52de7d2b6d2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 1 Sep 2012 19:21:06 +0200
Subject: [PATCH] distro: bash, readline: Correctly set RUNPATH to the
 dependencies.

* distro/base.scm (readline): Add configure flags to set an rpath on
  ncurses.
  (bash): Add configure flags to set an rpath to readline and ncurses.
---
 distro/base.scm | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/distro/base.scm b/distro/base.scm
index 005eefb2fb..5dade6aef7 100644
--- a/distro/base.scm
+++ b/distro/base.scm
@@ -840,7 +840,11 @@ UNIX.  It has even been ported to OS/2 Warp!")
               ,(search-patch "readline-link-ncurses.patch"))))
    (arguments `(#:patches (list (assoc-ref %build-inputs
                                            "patch/link-ncurses"))
-                #:patch-flags '("-p0")))
+                #:patch-flags '("-p0")
+                #:configure-flags
+                (list (string-append "LDFLAGS=-Wl,-rpath -Wl,"
+                                     (assoc-ref %build-inputs "ncurses")
+                                     "/lib"))))
    (description "GNU Readline, a library for interactive line editing")
    (long-description
     "The GNU Readline library provides a set of functions for use by
@@ -875,10 +879,18 @@ without Readline in applications which desire its capabilities.")
                (base32
                 "1n5kbblp5ykbz5q8aq88lsif2z0gnvddg9babk33024wxiwi2ym2"))))
      (build-system gnu-build-system)
-     (inputs `(("readline" ,readline)))           ; TODO: add texinfo
+     (inputs `(("readline" ,readline)
+               ("ncurses" ,ncurses)))             ; TODO: add texinfo
      (arguments
-      `(#:configure-flags '("--with-installed-readline"
-                            ,(string-append "CPPFLAGS=" cppflags))
+      `(#:configure-flags `("--with-installed-readline"
+                            ,,(string-append "CPPFLAGS=" cppflags)
+                            ,(string-append
+                              "LDFLAGS=-Wl,-rpath -Wl,"
+                              (assoc-ref %build-inputs "readline")
+                              "/lib"
+                              " -Wl,-rpath -Wl,"
+                              (assoc-ref %build-inputs "ncurses")
+                              "/lib"))
 
         ;; XXX: The tests have a lot of hard-coded paths, so disable them
         ;; for now.