summaryrefslogtreecommitdiff
path: root/gnu/packages/compression.scm
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-06-30 13:01:24 +0200
committerMarius Bakke <marius@gnu.org>2022-06-30 23:26:16 +0200
commit5aeb96103ff17c3183504a72b9130178c88ca735 (patch)
treed4cbb0615c7e23f5e8f4fb92cfcf020b2f881ba1 /gnu/packages/compression.scm
parent9959890264923563af68e3eb53c30e7cb348402e (diff)
gnu: zlib: Update to 1.2.12.
* gnu/packages/compression.scm (zlib): Update to 1.2.12. [source](patches): New field. [arguments]: Set CC variable. * gnu/packages/commencement.scm (zlib-final)[source]: New field. * gnu/packages/patches/zlib-cc.patch, gnu/packages/patches/zlib-correct-crc32-inputs.patch: New files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
Diffstat (limited to 'gnu/packages/compression.scm')
-rw-r--r--gnu/packages/compression.scm7
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 0ea8b1592d..17a690c0e4 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -100,7 +100,7 @@
(define-public zlib
(package
(name "zlib")
- (version "1.2.11")
+ (version "1.2.12")
(source
(origin
(method url-fetch)
@@ -108,9 +108,11 @@
version ".tar.gz")
(string-append "mirror://sourceforge/libpng/zlib/"
version "/zlib-" version ".tar.gz")))
+ (patches (search-patches "zlib-cc.patch"
+ "zlib-correct-crc32-inputs.patch"))
(sha256
(base32
- "18dighcs333gsvajvvgqp8l4cx7h1x7yx9gd5xacnk80spyykrf3"))))
+ "1n9na4fq4wagw1nzsfjr6wyly960jfa94460ncbf6p1fac44i14i"))))
(build-system gnu-build-system)
(outputs '("out" "static"))
(arguments
@@ -122,6 +124,7 @@
;; extra flags like `--enable-fast-install', so we need to
;; invoke it with just what it understand.
(let ((out (assoc-ref outputs "out")))
+ (setenv "CC" ,(cc-for-target))
;; 'configure' doesn't understand '--host'.
,@(if (%current-target-system)
`((setenv "CHOST" ,(%current-target-system)))