From 08f535eb2d438e52c1e84cefc1c270b9ad50620d Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Tue, 16 Oct 2018 16:20:11 +0200
Subject: gnu: chez: Adjust to zlib static output.

* gnu/packages/chez.scm (chez-scheme)[inputs]: Add ZLIB:STATIC.
[arguments]: Reference libz.a from that instead of ZLIB.
---
 gnu/packages/chez.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'gnu')

diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm
index c8e76b8ab4..929e50ee9b 100644
--- a/gnu/packages/chez.scm
+++ b/gnu/packages/chez.scm
@@ -85,6 +85,7 @@
        ("xorg-rgb" ,xorg-rgb)
        ("nanopass" ,nanopass)
        ("zlib" ,zlib)
+       ("zlib:static" ,zlib "static")
        ("stex" ,stex)))
     (native-inputs
      `(("texlive" ,texlive)
@@ -128,6 +129,7 @@
                    (nanopass (assoc-ref inputs "nanopass"))
                    (stex (assoc-ref inputs "stex"))
                    (zlib (assoc-ref inputs "zlib"))
+                   (zlib-static (assoc-ref inputs "zlib:static"))
                    (unpack (assoc-ref %standard-phases 'unpack))
                    (patch-source-shebangs
                     (assoc-ref %standard-phases 'patch-source-shebangs)))
@@ -148,7 +150,7 @@
                  (("\\$\\{Kernel\\}: \\$\\{kernelobj\\} \\.\\./zlib/libz\\.a")
                   "${Kernel}: ${kernelobj}")
                  (("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=./ ]+))")
                   (which "true")))
                (substitute* (find-files "mats" "Mf-.*")
-- 
cgit v1.2.3

' value='4d40c6aab0ebabf75845b3d4c7eecdf81adae10f'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=4d40c6aab0ebabf75845b3d4c7eecdf81adae10f'>root</a>/<a href='/guix/log/gnu?id=4d40c6aab0ebabf75845b3d4c7eecdf81adae10f'>gnu</a>/<a href='/guix/log/gnu/packages?id=4d40c6aab0ebabf75845b3d4c7eecdf81adae10f'>packages</a>/<a href='/guix/log/gnu/packages/gsasl.scm?id=4d40c6aab0ebabf75845b3d4c7eecdf81adae10f'>gsasl.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/gsasl.scm?id=4d40c6aab0ebabf75845b3d4c7eecdf81adae10f&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-03-30 01:30:16 +0200'>2017-03-30</span></td><td><a href='/guix/commit/gnu/packages/gsasl.scm?id=6fd52309b8f52c9bb59fccffac53e029ce94b698'>gnu: Use HTTPS for almost all gnu.org HOME-PAGEs.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-01-19 00:11:15 +0100'>2017-01-19</span></td><td><a href='/guix/commit/gnu/packages/gsasl.scm?id=89e34644d94860fafc053b759961ba8b55a6c77c'>gnu: Move Kerberos implemetations to (gnu packages kerberos).</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>