Skip to content

Commit 518d711

Browse files
DragonBluephauke
authored andcommitted
tools/zlib: update to 1.3.2
Release Notes: https://github.com/madler/zlib/blob/v1.3.2/ChangeLog We also switch package tarball source to GitHub repository releases to avoid package hash mismatch after the zstd upgrade. The 900-* patch was suppressed by the upstream commit 15ba5055a935 ("CMake: Adapt pkgconfig-file to the GnuInstallDirs layout.") Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: openwrt/openwrt#21228 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
1 parent 2a7cb48 commit 518d711

3 files changed

Lines changed: 56 additions & 19 deletions

File tree

tools/zlib/Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=zlib
11-
PKG_VERSION:=1.3.1
11+
PKG_VERSION:=1.3.2
1212
PKG_RELEASE:=1
1313

14-
PKG_SOURCE_PROTO:=git
15-
PKG_SOURCE_URL:=https://github.com/madler/zlib
16-
PKG_SOURCE_VERSION:=51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf
17-
PKG_MIRROR_HASH:=6558577038f4839057fad93afb295bf32e84dc9bd2c33512d40a5eab6d4889ef
14+
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
15+
PKG_SOURCE_URL:=https://github.com/madler/zlib/releases/download/v$(PKG_VERSION)
16+
PKG_HASH:=d7a0654783a4da529d1bb793b7ad9c3318020af77667bcae35f95d0e42a792f3
1817

1918
PKG_LICENSE:=Zlib
2019
PKG_LICENSE_FILES:=LICENSE
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
From 18a6dfff79b6357aada21bec506442ed96bb34da Mon Sep 17 00:00:00 2001
2+
From: Shiji Yang <yangshiji66@outlook.com>
3+
Date: Thu, 5 Mar 2026 00:13:35 +0800
4+
Subject: [PATCH] deflate: workaround elfutils link error on MacOS
5+
6+
duplicate symbol '_crc32' in:
7+
/Volumes/OpenWrt/openwrt/build_dir/host/elfutils-0.192/libdw/libdw.a[392](crc32.o)
8+
/Volumes/OpenWrt/openwrt/staging_dir/host/lib/libz.a[3](crc32.o)
9+
10+
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
11+
---
12+
deflate.c | 14 ++++++++++++++
13+
1 file changed, 14 insertions(+)
14+
15+
--- a/deflate.c
16+
+++ b/deflate.c
17+
@@ -970,12 +970,21 @@ local void flush_pending(z_streamp strm)
18+
/* ===========================================================================
19+
* Update the header CRC with the bytes s->pending_buf[beg..s->pending - 1].
20+
*/
21+
+#if defined(__APPLE__)
22+
+#define HCRC_UPDATE(beg) \
23+
+ do { \
24+
+ if (s->gzhead->hcrc && s->pending > (beg)) \
25+
+ strm->adler = crc32(strm->adler, s->pending_buf + (beg), \
26+
+ s->pending - (beg)); \
27+
+ } while (0)
28+
+#else
29+
#define HCRC_UPDATE(beg) \
30+
do { \
31+
if (s->gzhead->hcrc && s->pending > (beg)) \
32+
strm->adler = crc32_z(strm->adler, s->pending_buf + (beg), \
33+
s->pending - (beg)); \
34+
} while (0)
35+
+#endif
36+
37+
/* ========================================================================= */
38+
int ZEXPORT deflate(z_streamp strm, int flush) {
39+
@@ -1108,8 +1117,13 @@ int ZEXPORT deflate(z_streamp strm, int
40+
put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
41+
}
42+
if (s->gzhead->hcrc)
43+
+#if defined(__APPLE__)
44+
+ strm->adler = crc32(strm->adler, s->pending_buf,
45+
+ s->pending);
46+
+#else
47+
strm->adler = crc32_z(strm->adler, s->pending_buf,
48+
s->pending);
49+
+#endif
50+
s->gzindex = 0;
51+
s->status = EXTRA_STATE;
52+
}

tools/zlib/patches/900-overridable-pc-exec-prefix.patch

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)