me/guix
Archived
1
0
Fork 0
Code Activity

gnu: gcl: Clean up inputs.

Browse source 
* gnu/packages/lisp.scm (gcl)[arguments]: Remove readline substitution,
correctly substitute '/bin/sh' calls.
[inputs]: Add gmp, readline.
[native-inputs]: Remove readline.
This commit is contained in:
Efraim Flashner 2017-04-10 05:29:44 +03:00
parent 5c7815f205
commit 47fb74aebc
No known key found for this signature in database
GPG key ID: F4C1D3917EACEE93
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/lisp.scm
View file

@ -91,13 +91,6 @@
#:phases (alist-cons-before #:phases (alist-cons-before
'configure 'pre-conf 'configure 'pre-conf
(lambda _ (lambda _
;; Patch bug when building readline support. This bug was
;; also observed by Debian
;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741819
(substitute* "o/gcl_readline.d"
(("rl_attempted_completion_function = \
\\(CPPFunction \\*\\)rl_completion;")
"rl_attempted_completion_function = rl_completion;"))
(substitute* (substitute*
(append (append
'("pcl/impl/kcl/makefile.akcl" '("pcl/impl/kcl/makefile.akcl"
@ -107,16 +100,21 @@
"gcl-tk/makefile.prev" "gcl-tk/makefile.prev"
"add-defs1") "add-defs1")
(find-files "h" "\\.defs")) (find-files "h" "\\.defs"))
(("SHELL=/bin/(ba)?sh") (("SHELL=/bin/bash")
(string-append "SHELL=" (which "bash"))))) (string-append "SHELL=" (which "bash")))
(("SHELL=/bin/sh")
(string-append "SHELL=" (which "sh"))))
#t)
;; drop strip phase to make maxima build, see ;; drop strip phase to make maxima build, see
;; https://www.ma.utexas.edu/pipermail/maxima/2008/009769.html ;; https://www.ma.utexas.edu/pipermail/maxima/2008/009769.html
(alist-delete 'strip (alist-delete 'strip
%standard-phases)))) %standard-phases))))
(inputs
`(("gmp" ,gmp)
("readline" ,readline)))
(native-inputs (native-inputs
`(("gcc" ,gcc-4.9) `(("gcc" ,gcc-4.9)
("m4" ,m4) ("m4" ,m4)
("readline" ,readline)
("texinfo" ,texinfo) ("texinfo" ,texinfo)
("texlive" ,texlive))) ("texlive" ,texlive)))
(home-page "https://www.gnu.org/software/gcl/") (home-page "https://www.gnu.org/software/gcl/")