[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: gnu: chez: Adjust to zlib static output.
From: |
Marius Bakke |
Subject: |
01/03: gnu: chez: Adjust to zlib static output. |
Date: |
Tue, 16 Oct 2018 10:54:57 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 08f535eb2d438e52c1e84cefc1c270b9ad50620d
Author: Marius Bakke <address@hidden>
Date: Tue Oct 16 16:20:11 2018 +0200
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(-)
diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm
index c8e76b8..929e50e 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-.*")