Skip to content

Commit 9413a3d

Browse files
DragonBluephauke
authored andcommitted
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 005-* patch was suppressed by the upstream commit 15ba5055a935 ("CMake: Adapt pkgconfig-file to the GnuInstallDirs layout.") This patch also adjust the zlib.pc file path as it was changed in the latest release. The mipsel_24kc 'zlib' package size will increase by about 1 kB. Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: openwrt/openwrt#21228 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
1 parent 518d711 commit 9413a3d

3 files changed

Lines changed: 32 additions & 52 deletions

File tree

package/libs/zlib/Makefile

Lines changed: 6 additions & 7 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
@@ -71,7 +70,7 @@ define Build/InstallDev
7170
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \
7271
$(1)/usr/lib/
7372
mkdir -p $(1)/usr/lib/pkgconfig
74-
$(CP) $(PKG_INSTALL_DIR)/usr/share/pkgconfig/zlib.pc \
73+
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/zlib.pc \
7574
$(1)/usr/lib/pkgconfig/
7675
endef
7776

@@ -91,7 +90,7 @@ define Package/zlib-dev/install
9190
$(INSTALL_DIR) $(1)/usr/lib
9291
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.a $(1)/usr/lib/
9392
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
94-
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/pkgconfig/zlib.pc \
93+
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/zlib.pc \
9594
$(1)/usr/lib/pkgconfig/
9695
endef
9796

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
--- a/CMakeLists.txt
22
+++ b/CMakeLists.txt
3-
@@ -93,34 +93,67 @@ set(ZLIB_PUBLIC_HDRS
4-
${CMAKE_CURRENT_BINARY_DIR}/zconf.h
5-
zlib.h
6-
)
3+
@@ -121,33 +121,64 @@ configure_file(${zlib_BINARY_DIR}/zconf.
4+
5+
set(ZLIB_PUBLIC_HDRS ${zlib_BINARY_DIR}/zconf.h zlib.h)
6+
77
-set(ZLIB_PRIVATE_HDRS
88
- crc32.h
99
- deflate.h
@@ -13,8 +13,20 @@
1313
- inflate.h
1414
- inftrees.h
1515
- trees.h
16-
- zutil.h
17-
-)
16+
- zutil.h)
17+
+if(ARMv8)
18+
+ set(ZLIB_PRIVATE_HDRS
19+
+ crc32.h
20+
+ deflate.h
21+
+ gzguts.h
22+
+ inffast.h
23+
+ inffixed.h
24+
+ inflate.h
25+
+ inftrees.h
26+
+ trees.h
27+
+ zutil.h
28+
+ contrib/arm/chunkcopy.h)
29+
1830
-set(ZLIB_SRCS
1931
- adler32.c
2032
- compress.c
@@ -30,22 +42,7 @@
3042
- inffast.c
3143
- trees.c
3244
- uncompr.c
33-
- zutil.c
34-
-)
35-
+
36-
+if(ARMv8)
37-
+ set(ZLIB_PRIVATE_HDRS
38-
+ crc32.h
39-
+ deflate.h
40-
+ gzguts.h
41-
+ inffast.h
42-
+ inffixed.h
43-
+ inflate.h
44-
+ inftrees.h
45-
+ trees.h
46-
+ zutil.h
47-
+ contrib/arm/chunkcopy.h
48-
+ )
45+
- zutil.c)
4946
+ set(ZLIB_SRCS
5047
+ adler32.c
5148
+ compress.c
@@ -61,9 +58,8 @@
6158
+ contrib/arm/inffast.c
6259
+ trees.c
6360
+ uncompr.c
64-
+ zutil.c
65-
+ )
66-
+ else()
61+
+ zutil.c)
62+
+else()
6763
+ set(ZLIB_PRIVATE_HDRS
6864
+ crc32.h
6965
+ deflate.h
@@ -73,8 +69,8 @@
7369
+ inflate.h
7470
+ inftrees.h
7571
+ trees.h
76-
+ zutil.h
77-
+ )
72+
+ zutil.h)
73+
+
7874
+ set(ZLIB_SRCS
7975
+ adler32.c
8076
+ compress.c
@@ -90,9 +86,8 @@
9086
+ inffast.c
9187
+ trees.c
9288
+ uncompr.c
93-
+ zutil.c
94-
+ )
89+
+ zutil.c)
9590
+endif()
9691

97-
if(NOT MINGW)
98-
set(ZLIB_DLL_SRCS
92+
if(WIN32)
93+
set(zlib_static_suffix "s")

package/libs/zlib/patches/005-relative-pkg-config-paths.patch

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

0 commit comments

Comments
 (0)