lede/package/libs/zlib/patches/004-attach-sourcefiles-in-patch-002-to-buildsystem.patch

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,34 +91,67 @@ set(ZLIB_PUBLIC_HDRS
     ${CMAKE_CURRENT_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
-)
-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
-)
+
+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
+	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(NOT MINGW)
     set(ZLIB_DLL_SRCS
Add ARM and NEON optimizations 2018-01-08 18:19:57 +08:00			`--- a/CMakeLists.txt`
			`+++ b/CMakeLists.txt`
sync with upstream (#10562) * package: sync with upstream Removed: package/libs/libselinux/bcm27xx-userland (Already in package/utils/bcm27xx-userland) Signed-off-by: Linhui Liu <liulinhui36@gmail.com> * uclibc++: remove No package here depends on it. Furthermore, uClibc++ is a fairly buggy C++ library and seems to be relatively inactive upstream. It also lacks proper support for modern C++11 features. The main benefit of it is size: 66.6 KB vs 287.3 KB on mips24kc. Static linking and LTO can help bring the size down of packages that need it. Added warning message to uclibc++.mk Signed-off-by: Rosen Penev <rosenp@gmail.com> Acked-by: Hauke Mehrtens <hauke@hauke-m.de> * target: sync with upstream Signed-off-by: Linhui Liu <liulinhui36@gmail.com> * toolchain: gcc: Remove gcc 10.x support This compiler is old and was never used by default in OpenWrt. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> * ucode: update to latest Git HEAD 46d93c9 tests: fixup testcases 4c654df types: adjust double printing format eac2add compiler: fix bytecode for logical assignments of properties 3903b18 fs: add `realpath()` function 8366102 math: add isnan() function eef83d3 tests: relax sleep() test 394e901 lib: uc_json(): accept trailing whitespace when parsing strings 1867c8b uloop: terminate parent uloop in task child processes d2cc003 uci: auto-load package in `ctx.foreach()` and `ctx.get_first()` 6c5ee53 compiler: ensure that arrow functions with block bodies return no value fdc9b6a compiler: fix `??=`, `\|\|=` and `&&=` logical assignment semantics 88dcca7 add cmake to install requires for debian Signed-off-by: Jo-Philipp Wich <jo@mein.io> * firewall4: update to latest Git HEAD 700a925 fw4: prevent null access when no ipsets are defined 6443ec7 config: drop input traffic by default 119ee1a ruleset: drop ctstate invalid traffic for masq-enabled zones Signed-off-by: Jo-Philipp Wich <jo@mein.io> * ustream-ssl: update to Git version 2022-12-07 9217ab4 ustream-openssl: Disable renegotiation in TLSv1.2 and earlier 2ce1d48 ci: fix building with i.MX6 SDK 584f1f6 ustream-openssl: wolfSSL: provide detailed information in debug builds aa8c48e cmake: add a possibility to set library version Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> * tools/mpfr: import patch fixing macro bug Co-authored-by: Nick Hainke <vincent@systemli.org> Signed-off-by: Linhui Liu <liulinhui36@gmail.com> Signed-off-by: Linhui Liu <liulinhui36@gmail.com> Signed-off-by: Rosen Penev <rosenp@gmail.com> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Jo-Philipp Wich <jo@mein.io> Co-authored-by: Rosen Penev <rosenp@gmail.com> Co-authored-by: Hauke Mehrtens <hauke@hauke-m.de> Co-authored-by: Jo-Philipp Wich <jo@mein.io> Co-authored-by: Nick Hainke <vincent@systemli.org> 2022-12-08 14:20:57 +08:00			`@@ -91,34 +91,67 @@ set(ZLIB_PUBLIC_HDRS`
Add ARM and NEON optimizations 2018-01-08 18:19:57 +08:00			`${CMAKE_CURRENT_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`
			`-)`
			`-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`
			`-)`
			`+`
			`+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`
			`+ 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(NOT MINGW)`
			`set(ZLIB_DLL_SRCS`