zlib: Update to 1.3.0.1-motley

Signed-off-by: sekaiacg <[email protected]>

build/cmake/erofs-tools/erofs_tools.cmake

@@ -16,7 +16,7 @@ set(common_headers
 if (CMAKE_SYSTEM_NAME MATCHES "Linux|Android")
 	set(ld_start_group "-Wl,--start-group" "fuse_static")
 	set(ld_end_group "-Wl,--end-group")
-endif()
+endif ()
 
 set(common_static_link_lib
 	${ld_start_group}
@@ -28,14 +28,15 @@ set(common_static_link_lib
 	selinux
 	lz4_static
 	liblzma
-	z_stable
+	z_static
 	pcre2
 	${ld_end_group}
 )
 
+
 if (CMAKE_SYSTEM_NAME MATCHES "Darwin|CYGWIN")
 	list(APPEND common_static_link_lib "ext2_uuid" "iconv")
-endif()
+endif ()
 
 if (CYGWIN)
 	# extract.erofs use ntdll function to change a dir case sensitive
@@ -70,7 +71,7 @@ target_compile_options(${TARGET_fsck} PRIVATE ${common_compile_flags})
 ##################################################################################
 
 if (CMAKE_SYSTEM_NAME MATCHES "Linux|Android")
-###############################------fuse.erofs------###############################
+	###############################------fuse.erofs------###############################
 	set(TARGET_fuse fuse.erofs)
 	set(fuse_srcs "${PROJECT_ROOT_DIR}/fuse/main.c")
 
@@ -102,5 +103,5 @@ elseif (CYGWIN)
 		"$<$<COMPILE_LANGUAGE:C>:${LIBFUSE_DEFAULTS_CFLAGS}>"
 		"$<$<COMPILE_LANGUAGE:CXX>:${LIBFUSE_DEFAULTS_CFLAGS}>"
 	)
-##################################################################################
-endif()
+	##################################################################################
+endif ()

build/cmake/lib/CMakeLists.txt

@@ -3,7 +3,7 @@ if (NOT CYGWIN)
 	# Cygwin libcxx is not impl yet
 	# Use stdc++ instead
 	include(libcxx/libcxx.cmake)
-endif()
+endif ()
 include(libbase.cmake)
 include(libcutils.cmake)
 include(liblog.cmake)
@@ -17,7 +17,6 @@ elseif (CMAKE_SYSTEM_NAME MATCHES "Darwin|CYGWIN")
 	include(libext2_uuid.cmake)
 endif ()
 
-# Thrid part library
 # LZ4
 set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 set(LZ4_BUILD_CLI OFF)

build/cmake/lib/libz.cmake

@@ -1,4 +1,4 @@
-set(TARGET z_stable)
+set(TARGET z_static)
 
 set(TARGET_SRC_DIR "${LIB_DIR}/zlib")
 
@@ -47,14 +47,14 @@ set(cflags_x86 "-DX86_NOT_WINDOWS" "-DCPU_NO_SIMD")
 set(cflags_android_x86 "-UCPU_NO_SIMD" "-DADLER32_SIMD_SSSE3")
 set(cflags_64 "-DINFLATE_CHUNK_READ_64LE")
 
-if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+if (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64|aarch64")
 	list(APPEND TARGET_CFLAGS ${cflags_arm64} ${cflags_64})
 	if (CMAKE_SYSTEM_NAME MATCHES "Linux|Android")
 		list(APPEND TARGET_CFLAGS "-DARMV8_OS_LINUX")
 	elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 		list(APPEND TARGET_CFLAGS "-DARMV8_OS_MACOS")
 	endif ()
-elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "arm|armv7-a")
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7-a")
 	list(APPEND TARGET_CFLAGS ${cflags_arm})
 	if (CMAKE_SYSTEM_NAME STREQUAL "Android")
 		list(APPEND TARGET_CFLAGS "-DARMV8_OS_LINUX")