TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: chez: Adjust to zlib static output.

Browse source 
* gnu/packages/chez.scm (chez-scheme)[inputs]: Add ZLIB:STATIC.
[arguments]: Reference libz.a from that instead of ZLIB.
This commit is contained in:
Marius Bakke 2018-10-16 16:20:11 +02:00
parent 1a2d8d06b5
commit 08f535eb2d
No known key found for this signature in database
GPG key ID: E1F7EF814F92A10E
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/chez.scm
View file

@ -85,6 +85,7 @@ (define-public chez-scheme
("xorg-rgb" ,xorg-rgb) ("xorg-rgb" ,xorg-rgb)
("nanopass" ,nanopass) ("nanopass" ,nanopass)
("zlib" ,zlib) ("zlib" ,zlib)
("zlib:static" ,zlib "static")
("stex" ,stex))) ("stex" ,stex)))
(native-inputs (native-inputs
`(("texlive" ,texlive) `(("texlive" ,texlive)
@ -128,6 +129,7 @@ (define-public chez-scheme
(nanopass (assoc-ref inputs "nanopass")) (nanopass (assoc-ref inputs "nanopass"))
(stex (assoc-ref inputs "stex")) (stex (assoc-ref inputs "stex"))
(zlib (assoc-ref inputs "zlib")) (zlib (assoc-ref inputs "zlib"))
(zlib-static (assoc-ref inputs "zlib:static"))
(unpack (assoc-ref %standard-phases 'unpack)) (unpack (assoc-ref %standard-phases 'unpack))
(patch-source-shebangs (patch-source-shebangs
(assoc-ref %standard-phases 'patch-source-shebangs))) (assoc-ref %standard-phases 'patch-source-shebangs)))
@ -148,7 +150,7 @@ (define-public chez-scheme
(("\\$\\{Kernel\\}: \\$\\{kernelobj\\} \\.\\./zlib/libz\\.a") (("\\$\\{Kernel\\}: \\$\\{kernelobj\\} \\.\\./zlib/libz\\.a")
"${Kernel}: ${kernelobj}") "${Kernel}: ${kernelobj}")
(("ld ([-a-zA-Z0-9_${} ]+) \\.\\./zlib/libz\\.a" all args) (("ld ([-a-zA-Z0-9_${} ]+) \\.\\./zlib/libz\\.a" all args)
(string-append "ld " args " " zlib "/lib/libz.a")) (string-append "ld " args " " zlib-static "/lib/libz.a"))
(("\\(cd \\.\\./zlib; ([-a-zA-Z0-9=./ ]+))") (("\\(cd \\.\\./zlib; ([-a-zA-Z0-9=./ ]+))")
(which "true"))) (which "true")))
(substitute* (find-files "mats" "Mf-.*") (substitute* (find-files "mats" "Mf-.*")