openwrt/tools/cmake/patches/150-zstd-libarchive.patch

--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -680,7 +680,7 @@ IF(ENABLE_ZSTD)
     SET(ZSTD_FIND_QUIETLY TRUE)
   ENDIF (ZSTD_INCLUDE_DIR)
 
-  IF(0) # CMake does not let pkg-config override its search paths.
+  IF(1) # CMake does not let pkg-config override its search paths.
   IF(UNIX)
     FIND_PACKAGE(PkgConfig QUIET)
     PKG_SEARCH_MODULE(PC_ZSTD libzstd)
tools/cmake: fix compilation with host libzstd-dev cmake's find_package looks at host paths first for some reason. Switch to using pkgconfig for the search, matching other modules. Fixes: 3848cf458ef9 ("tools/cmake: Build without some included libs") Signed-off-by: Rosen Penev <rosenp@gmail.com> 2022-09-30 08:42:51 +00:00			`--- a/Utilities/cmlibarchive/CMakeLists.txt`
			`+++ b/Utilities/cmlibarchive/CMakeLists.txt`
tools/cmake: update to 3.31.2 Release notes: https://cmake.org/cmake/help/latest/release/3.31.html Refresh patches: - 120-curl-fix-libressl-linking.patch - 130-bootstrap_parallel_make_flag.patch - 150-zstd-libarchive.patch - 160-disable_xcode_generator.patch Signed-off-by: Jack Sun <sunjiazheng321521@gmail.com> Link: https://github.com/openwrt/openwrt/pull/17056 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> 2024-12-09 08:43:49 +00:00			`@@ -680,7 +680,7 @@ IF(ENABLE_ZSTD)`
tools/cmake: fix compilation with host libzstd-dev cmake's find_package looks at host paths first for some reason. Switch to using pkgconfig for the search, matching other modules. Fixes: 3848cf458ef9 ("tools/cmake: Build without some included libs") Signed-off-by: Rosen Penev <rosenp@gmail.com> 2022-09-30 08:42:51 +00:00			`SET(ZSTD_FIND_QUIETLY TRUE)`
			`ENDIF (ZSTD_INCLUDE_DIR)`

tools/cmake: update to 3.27.1 Fix zstd linking again. Signed-off-by: Rosen Penev <rosenp@gmail.com> 2023-08-02 00:56:00 +00:00			`- IF(0) # CMake does not let pkg-config override its search paths.`
			`+ IF(1) # CMake does not let pkg-config override its search paths.`
			`IF(UNIX)`
			`FIND_PACKAGE(PkgConfig QUIET)`
			`PKG_SEARCH_MODULE(PC_ZSTD libzstd)`