From 5c7815f205e9164d4b82378de91bee7a65bcfbcb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 10 Apr 2017 05:20:36 +0300 Subject: gnu: gcl: Build with gcc@4.9. * gnu/packages/lisp.scm (gcl)[native-inputs]: Add gcc@4.9. --- gnu/packages/lisp.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 2bbe398079..2e840a087f 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -113,7 +114,8 @@ (alist-delete 'strip %standard-phases)))) (native-inputs - `(("m4" ,m4) + `(("gcc" ,gcc-4.9) + ("m4" ,m4) ("readline" ,readline) ("texinfo" ,texinfo) ("texlive" ,texlive))) -- cgit v1.2.3 From 47fb74aebc45005d8045f81e69d2c69da31621f0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 10 Apr 2017 05:29:44 +0300 Subject: gnu: gcl: Clean up inputs. * gnu/packages/lisp.scm (gcl)[arguments]: Remove readline substitution, correctly substitute '/bin/sh' calls. [inputs]: Add gmp, readline. [native-inputs]: Remove readline. --- gnu/packages/lisp.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 2e840a087f..6246840afa 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -91,13 +91,6 @@ #:phases (alist-cons-before 'configure 'pre-conf (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* (append '("pcl/impl/kcl/makefile.akcl" @@ -107,16 +100,21 @@ "gcl-tk/makefile.prev" "add-defs1") (find-files "h" "\\.defs")) - (("SHELL=/bin/(ba)?sh") - (string-append "SHELL=" (which "bash"))))) + (("SHELL=/bin/bash") + (string-append "SHELL=" (which "bash"))) + (("SHELL=/bin/sh") + (string-append "SHELL=" (which "sh")))) + #t) ;; drop strip phase to make maxima build, see ;; https://www.ma.utexas.edu/pipermail/maxima/2008/009769.html (alist-delete 'strip %standard-phases)))) + (inputs + `(("gmp" ,gmp) + ("readline" ,readline))) (native-inputs `(("gcc" ,gcc-4.9) ("m4" ,m4) - ("readline" ,readline) ("texinfo" ,texinfo) ("texlive" ,texlive))) (home-page "https://www.gnu.org/software/gcl/") -- cgit v1.2.3 From 1803f2493ebe3baf0ce1ce279372e0396c02b76f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 10 Apr 2017 05:34:17 +0300 Subject: gnu: gcl: Use 'modify-phases' syntax. * gnu/packages/lisp.scm (gcl)[arguments]: Use 'modify-phases' syntax. --- gnu/packages/lisp.scm | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 6246840afa..fc78a60f18 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -88,27 +88,26 @@ `(#:parallel-build? #f ; The build system seems not to be thread safe. #:tests? #f ; There does not seem to be make check or anything similar. #:configure-flags '("--enable-ansi") ; required for use by the maxima package - #:phases (alist-cons-before - 'configure 'pre-conf - (lambda _ - (substitute* - (append - '("pcl/impl/kcl/makefile.akcl" - "add-defs" - "unixport/makefile.dos" - "add-defs.bat" - "gcl-tk/makefile.prev" - "add-defs1") - (find-files "h" "\\.defs")) - (("SHELL=/bin/bash") - (string-append "SHELL=" (which "bash"))) - (("SHELL=/bin/sh") - (string-append "SHELL=" (which "sh")))) - #t) - ;; drop strip phase to make maxima build, see - ;; https://www.ma.utexas.edu/pipermail/maxima/2008/009769.html - (alist-delete 'strip - %standard-phases)))) + #:phases (modify-phases %standard-phases + (add-before 'configure 'pre-conf + (lambda _ + (substitute* + (append + '("pcl/impl/kcl/makefile.akcl" + "add-defs" + "unixport/makefile.dos" + "add-defs.bat" + "gcl-tk/makefile.prev" + "add-defs1") + (find-files "h" "\\.defs")) + (("SHELL=/bin/bash") + (string-append "SHELL=" (which "bash"))) + (("SHELL=/bin/sh") + (string-append "SHELL=" (which "sh")))) + #t)) + ;; drop strip phase to make maxima build, see + ;; https://www.ma.utexas.edu/pipermail/maxima/2008/009769.html + (delete 'strip)))) (inputs `(("gmp" ,gmp) ("readline" ,readline))) -- cgit v1.2.3