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

gnu: guile-1.8: Patch `ice-9/popen.scm'. 

* gnu/packages/guile.scm (guile-1.8): Rename `patch-loader-search-path'
  to `patch-stuff'; patch `ice-9/popen.scm'.
This commit is contained in:
Ludovic Courtès 2013-02-08 00:15:26 +01:00
parent 461572cca8
commit 2f4fbe1cb3
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/guile.scm
View File

@ -58,17 +58,21 @@
;; Insert a phase before `configure' to patch things up. ;; Insert a phase before `configure' to patch things up.
#:phases (alist-cons-before #:phases (alist-cons-before
'configure 'configure
'patch-loader-search-path 'patch-stuff
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Add a call to `lt_dladdsearchdir' so that ;; Add a call to `lt_dladdsearchdir' so that
;; `libguile-readline.so' & co. are in the ;; `libguile-readline.so' & co. are in the
;; loader's search path. ;; loader's search path.
(substitute* "libguile/dynl.c" (substitute* "libguile/dynl.c"
(("lt_dlinit.*$" match) (("lt_dlinit.*$" match)
(format #f (format #f
" ~a~% lt_dladdsearchdir(\"~a/lib\");~%" " ~a~% lt_dladdsearchdir(\"~a/lib\");~%"
match match
(assoc-ref outputs "out"))))) (assoc-ref outputs "out"))))
;; The usual /bin/sh...
(substitute* "ice-9/popen.scm"
(("/bin/sh") (which "sh"))))
%standard-phases))) %standard-phases)))
(inputs `(("patch/snarf" ,(search-patch "guile-1.8-cpp-4.5.patch")) (inputs `(("patch/snarf" ,(search-patch "guile-1.8-cpp-4.5.patch"))
("gawk" ,gawk) ("gawk" ,gawk)