me/guix
Archived
1
0
Fork 0
Code Activity

gnu: chez-scheme: Use shared zlib and lz4.

Browse source 
This change also involves building 'libkernel.a' instead of 'kernel.o'.

Support for these build options was merged upstream in 2019: see
discussion at <https://github.com/cisco/ChezScheme/pull/443>.

* gnu/packages/chez.scm (chez-scheme)[inputs]: Remove 'zlib:static' and
'lz4:static'.
[arguments]: Adjust configure phase accordingly.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
This commit is contained in:
Philip McGrath 2022-02-27 16:29:12 -05:00 • committed by Liliana Marie Prikler
parent 2a3946bae9
commit 37a75d23a9
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
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/chez.scm
View file

@ -211,9 +211,7 @@ If native threads are supported, the returned list will include
(inputs (inputs
`(("libuuid" ,util-linux "lib") `(("libuuid" ,util-linux "lib")
("zlib" ,zlib) ("zlib" ,zlib)
("zlib:static" ,zlib "static")
("lz4" ,lz4) ("lz4" ,lz4)
("lz4:static" ,lz4 "static")
;; for expeditor: ;; for expeditor:
("ncurses" ,ncurses) ("ncurses" ,ncurses)
;; for X11 clipboard support in expeditor: ;; for X11 clipboard support in expeditor:
@ -266,14 +264,14 @@ If native threads are supported, the returned list will include
(lz4-static (assoc-ref inputs "lz4:static")) (lz4-static (assoc-ref inputs "lz4:static"))
(out (assoc-ref outputs "out")) (out (assoc-ref outputs "out"))
;; add flags which are always required: ;; add flags which are always required:
(flags (cons* (flags (cons* (string-append "--installprefix=" out)
(string-append "--installprefix=" out) "ZLIB=-lz"
(string-append "ZLIB=" zlib-static "/lib/libz.a") "LZ4=-llz4"
(string-append "LZ4=" lz4-static "/lib/liblz4.a") "--libkernel"
;; Guix will do compress man pages, ;; Guix will do compress-man-pages,
;; and letting Chez try causes an error ;; and letting Chez try causes an error
"--nogzip-man-pages" "--nogzip-man-pages"
configure-flags))) configure-flags)))
(format #t "configure flags: ~s~%" flags) (format #t "configure flags: ~s~%" flags)
;; Some makefiles (for tests) don't seem to propagate CC ;; Some makefiles (for tests) don't seem to propagate CC
;; properly, so we take it out of their hands: ;; properly, so we take it out of their hands: