gnu: gcl: Update snapshot.
* gnu/packages/lisp.scm (gcl): Update to 2.6.12-1.5956140. [arguments]: Remove CFLAGS from and add GCL_CC and CC to make-flags; adjust pre-conf phase. This update includes small upstream bug fixes and optimizations.master
parent
01e9bc463f
commit
dd0134fcb7
|
@ -76,81 +76,102 @@
|
||||||
,lisp))))
|
,lisp))))
|
||||||
|
|
||||||
(define-public gcl
|
(define-public gcl
|
||||||
(package
|
(let ((commit "5956140b1083e2302a59d7ce2054b0b7c2cbb417")
|
||||||
(name "gcl")
|
(revision "1")) ;Guix package revision
|
||||||
(version "2.6.12")
|
(package
|
||||||
(source
|
(name "gcl")
|
||||||
(origin
|
(version (string-append "2.6.12-" revision "."
|
||||||
(method url-fetch)
|
(string-take commit 7)))
|
||||||
(uri (string-append "mirror://gnu/" name "/" name "-" version ".tar.gz"))
|
(source
|
||||||
(sha256
|
(origin
|
||||||
(base32 "1s4hs2qbjqmn9h88l4xvsifq5c3dlc5s74lyb61rdi5grhdlkf4f"))))
|
(method git-fetch)
|
||||||
(build-system gnu-build-system)
|
(uri (git-reference
|
||||||
(arguments
|
(url "https://git.savannah.gnu.org/r/gcl.git")
|
||||||
`(#:parallel-build? #f ; The build system seems not to be thread safe.
|
(commit commit)))
|
||||||
#:tests? #f ; There does not seem to be make check or anything similar.
|
(file-name (string-append "gcl-" version "-checkout"))
|
||||||
#:configure-flags '("--enable-ansi") ; required for use by the maxima package
|
(sha256
|
||||||
#:make-flags (list
|
(base32 "0mwclf2879mh3d9xqkqhghf58lwy7srsnsq9x0f1cc6j302sy4hb"))))
|
||||||
"CFLAGS=-fgnu89-inline" ; removes inline function warnings
|
(build-system gnu-build-system)
|
||||||
(string-append "GCC=" (assoc-ref %build-inputs "gcc")
|
(arguments
|
||||||
"/bin/gcc"))
|
`(#:parallel-build? #f ; The build system seems not to be thread safe.
|
||||||
#:phases (modify-phases %standard-phases
|
#:tests? #f ; There does not seem to be make check or anything similar.
|
||||||
(add-before 'configure 'pre-conf
|
#:configure-flags '("--enable-ansi") ; required for use by the maxima package
|
||||||
(lambda _
|
#:make-flags (list
|
||||||
(substitute*
|
(string-append "GCL_CC=" (assoc-ref %build-inputs "gcc")
|
||||||
(append
|
"/bin/gcc")
|
||||||
'("pcl/impl/kcl/makefile.akcl"
|
(string-append "CC=" (assoc-ref %build-inputs "gcc")
|
||||||
"add-defs"
|
"/bin/gcc"))
|
||||||
"unixport/makefile.dos"
|
#:phases
|
||||||
"add-defs.bat"
|
(modify-phases %standard-phases
|
||||||
"gcl-tk/makefile.prev"
|
(add-before 'configure 'pre-conf
|
||||||
"add-defs1")
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(find-files "h" "\\.defs"))
|
(chdir "gcl")
|
||||||
(("SHELL=/bin/bash")
|
(substitute*
|
||||||
(string-append "SHELL=" (which "bash")))
|
(append
|
||||||
(("SHELL=/bin/sh")
|
'("pcl/impl/kcl/makefile.akcl"
|
||||||
(string-append "SHELL=" (which "sh"))))
|
"add-defs"
|
||||||
(substitute* "h/linux.defs"
|
"unixport/makefile.dos"
|
||||||
(("#CC") "CC")
|
"add-defs.bat"
|
||||||
(("-fwritable-strings") "")
|
"gcl-tk/makefile.prev"
|
||||||
(("-Werror") ""))
|
"add-defs1")
|
||||||
#t))
|
(find-files "h" "\\.defs"))
|
||||||
(add-after 'install 'wrap
|
(("SHELL=/bin/bash")
|
||||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
(string-append "SHELL=" (which "bash")))
|
||||||
(let* ((gcl (assoc-ref outputs "out"))
|
(("SHELL=/bin/sh")
|
||||||
(input-path (lambda (lib path)
|
(string-append "SHELL=" (which "sh"))))
|
||||||
(string-append
|
(substitute* "h/linux.defs"
|
||||||
(assoc-ref inputs lib) path)))
|
(("#CC") "CC")
|
||||||
(binaries '("binutils")))
|
(("-fwritable-strings") "")
|
||||||
;; GCC and the GNU binutils are necessary for GCL to be
|
(("-Werror") ""))
|
||||||
;; able to compile Lisp functions and programs (this is
|
(substitute* "lsp/gcl_top.lsp"
|
||||||
;; a standard feature in Common Lisp). While the
|
(("\"cc\"")
|
||||||
;; the location of GCC is specified in the make-flags,
|
(string-append "\"" (assoc-ref %build-inputs "gcc")
|
||||||
;; the GNU binutils must be available in GCL's $PATH.
|
"/bin/gcc\""))
|
||||||
(wrap-program (string-append gcl "/bin/gcl")
|
(("\\(or \\(get-path \\*cc\\*\\) \\*cc\\*\\)") "*cc*")
|
||||||
`("PATH" prefix ,(map (lambda (binary)
|
(("\"ld\"")
|
||||||
(input-path binary "/bin"))
|
(string-append "\"" (assoc-ref %build-inputs "binutils")
|
||||||
binaries))))
|
"/bin/ld\""))
|
||||||
#t))
|
(("\\(or \\(get-path \\*ld\\*\\) \\*ld\\*\\)") "*ld*")
|
||||||
;; drop strip phase to make maxima build, see
|
(("\\(get-path \"objdump --source \"\\)")
|
||||||
;; https://www.ma.utexas.edu/pipermail/maxima/2008/009769.html
|
(string-append "\"" (assoc-ref %build-inputs "binutils")
|
||||||
(delete 'strip))))
|
"/bin/objdump --source \"")))
|
||||||
(inputs
|
#t))
|
||||||
`(("gmp" ,gmp)
|
(add-after 'install 'wrap
|
||||||
("readline" ,readline)))
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||||
(native-inputs
|
(let* ((gcl (assoc-ref outputs "out"))
|
||||||
`(("gcc" ,gcc-4.9)
|
(input-path (lambda (lib path)
|
||||||
("m4" ,m4)
|
(string-append
|
||||||
("texinfo" ,texinfo)
|
(assoc-ref inputs lib) path)))
|
||||||
("texlive" ,texlive)))
|
(binaries '("binutils")))
|
||||||
(home-page "https://www.gnu.org/software/gcl/")
|
;; GCC and the GNU binutils are necessary for GCL to be
|
||||||
(synopsis "A Common Lisp implementation")
|
;; able to compile Lisp functions and programs (this is
|
||||||
(description "GCL is an implementation of the Common Lisp language. It
|
;; a standard feature in Common Lisp). While the
|
||||||
|
;; the location of GCC is specified in the make-flags,
|
||||||
|
;; the GNU binutils must be available in GCL's $PATH.
|
||||||
|
(wrap-program (string-append gcl "/bin/gcl")
|
||||||
|
`("PATH" prefix ,(map (lambda (binary)
|
||||||
|
(input-path binary "/bin"))
|
||||||
|
binaries))))
|
||||||
|
#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)))
|
||||||
|
(native-inputs
|
||||||
|
`(("gcc" ,gcc-4.9)
|
||||||
|
("m4" ,m4)
|
||||||
|
("texinfo" ,texinfo)
|
||||||
|
("texlive" ,texlive)))
|
||||||
|
(home-page "https://www.gnu.org/software/gcl/")
|
||||||
|
(synopsis "A Common Lisp implementation")
|
||||||
|
(description "GCL is an implementation of the Common Lisp language. It
|
||||||
features the ability to compile to native object code and to load native
|
features the ability to compile to native object code and to load native
|
||||||
object code modules directly into its lisp core. It also features a
|
object code modules directly into its lisp core. It also features a
|
||||||
stratified garbage collection strategy, a source-level debugger and a built-in
|
stratified garbage collection strategy, a source-level debugger and a built-in
|
||||||
interface to the Tk widget system.")
|
interface to the Tk widget system.")
|
||||||
(license license:lgpl2.0+)))
|
(license license:lgpl2.0+))))
|
||||||
|
|
||||||
(define-public ecl
|
(define-public ecl
|
||||||
(package
|
(package
|
||||||
|
|
Reference in New Issue