nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
master
Ludovic Courtès 2012-09-01 19:21:06 +02:00
parent 6818af7ba5
commit ea52a52d7c
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
distro/base.scm
View File

@ -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.