mirror of
https://github.com/opencv/opencv.git
synced 2024-12-15 09:49:13 +08:00
85923c8f30
Update zlib-ng to 2.2.1 #26113 Release: https://github.com/zlib-ng/zlib-ng/releases/tag/2.2.1 ARM diagnostics patch: https://github.com/zlib-ng/zlib-ng/pull/1774 ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [ ] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [ ] The feature is well documented and sample code can be built with the project CMake
14 lines
508 B
Diff
14 lines
508 B
Diff
diff --git a/3rdparty/zlib-ng/cmake/detect-intrinsics.cmake b/3rdparty/zlib-ng/cmake/detect-intrinsics.cmake
|
|
index 14f82fc..78e46e1 100644
|
|
--- a/3rdparty/zlib-ng/cmake/detect-intrinsics.cmake
|
|
+++ b/3rdparty/zlib-ng/cmake/detect-intrinsics.cmake
|
|
@@ -66,7 +66,7 @@ macro(check_armv6_compiler_flag)
|
|
return __uqsub16(a, b);
|
|
#endif
|
|
}
|
|
- int main(void) { return 0; }"
|
|
+ int main(void) { return f(1,2); }"
|
|
HAVE_ARMV6_INTRIN
|
|
)
|
|
set(CMAKE_REQUIRED_FLAGS)
|