summaryrefslogtreecommitdiff
path: root/distro
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-09-01 19:21:06 +0200
committerLudovic Courtès <ludo@gnu.org>2012-09-03 01:06:58 +0200
commitea52a52d7c635e0fed70903c720a52de7d2b6d2e (patch)
treee996a035af32db1c6ab54c8237115e3dafddea15 /distro
parent6818af7ba54b2e03a774e344412430a6687e3218 (diff)
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.
Diffstat (limited to 'distro')
-rw-r--r--distro/base.scm20
1 files 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.