9413a3d96d
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: https://github.com/openwrt/openwrt/pull/21228 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
94 lines
1.3 KiB
Diff
94 lines
1.3 KiB
Diff
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -121,33 +121,64 @@ configure_file(${zlib_BINARY_DIR}/zconf.
|
|
|
|
set(ZLIB_PUBLIC_HDRS ${zlib_BINARY_DIR}/zconf.h zlib.h)
|
|
|
|
-set(ZLIB_PRIVATE_HDRS
|
|
- crc32.h
|
|
- deflate.h
|
|
- gzguts.h
|
|
- inffast.h
|
|
- inffixed.h
|
|
- inflate.h
|
|
- inftrees.h
|
|
- trees.h
|
|
- zutil.h)
|
|
+if(ARMv8)
|
|
+ set(ZLIB_PRIVATE_HDRS
|
|
+ crc32.h
|
|
+ deflate.h
|
|
+ gzguts.h
|
|
+ inffast.h
|
|
+ inffixed.h
|
|
+ inflate.h
|
|
+ inftrees.h
|
|
+ trees.h
|
|
+ zutil.h
|
|
+ contrib/arm/chunkcopy.h)
|
|
|
|
-set(ZLIB_SRCS
|
|
- adler32.c
|
|
- compress.c
|
|
- crc32.c
|
|
- deflate.c
|
|
- gzclose.c
|
|
- gzlib.c
|
|
- gzread.c
|
|
- gzwrite.c
|
|
- inflate.c
|
|
- infback.c
|
|
- inftrees.c
|
|
- inffast.c
|
|
- trees.c
|
|
- uncompr.c
|
|
- zutil.c)
|
|
+ set(ZLIB_SRCS
|
|
+ adler32.c
|
|
+ compress.c
|
|
+ crc32.c
|
|
+ deflate.c
|
|
+ gzclose.c
|
|
+ gzlib.c
|
|
+ gzread.c
|
|
+ gzwrite.c
|
|
+ infback.c
|
|
+ inftrees.c
|
|
+ contrib/arm/inflate.c
|
|
+ contrib/arm/inffast.c
|
|
+ trees.c
|
|
+ uncompr.c
|
|
+ zutil.c)
|
|
+else()
|
|
+ set(ZLIB_PRIVATE_HDRS
|
|
+ crc32.h
|
|
+ deflate.h
|
|
+ gzguts.h
|
|
+ inffast.h
|
|
+ inffixed.h
|
|
+ inflate.h
|
|
+ inftrees.h
|
|
+ trees.h
|
|
+ zutil.h)
|
|
+
|
|
+ set(ZLIB_SRCS
|
|
+ adler32.c
|
|
+ compress.c
|
|
+ crc32.c
|
|
+ deflate.c
|
|
+ gzclose.c
|
|
+ gzlib.c
|
|
+ gzread.c
|
|
+ gzwrite.c
|
|
+ inflate.c
|
|
+ infback.c
|
|
+ inftrees.c
|
|
+ inffast.c
|
|
+ trees.c
|
|
+ uncompr.c
|
|
+ zutil.c)
|
|
+endif()
|
|
|
|
if(WIN32)
|
|
set(zlib_static_suffix "s")
|