From 0e3d51ccaedff49477f12205062a3cb0c49a96e8 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 30 Sep 2022 01:42:51 -0700 Subject: [PATCH] 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 --- tools/cmake/patches/150-zstd-libarchive.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 tools/cmake/patches/150-zstd-libarchive.patch diff --git a/tools/cmake/patches/150-zstd-libarchive.patch b/tools/cmake/patches/150-zstd-libarchive.patch new file mode 100644 index 0000000000..603ac03775 --- /dev/null +++ b/tools/cmake/patches/150-zstd-libarchive.patch @@ -0,0 +1,18 @@ +--- a/Utilities/cmlibarchive/CMakeLists.txt ++++ b/Utilities/cmlibarchive/CMakeLists.txt +@@ -630,8 +630,13 @@ IF(ENABLE_ZSTD) + SET(ZSTD_FIND_QUIETLY TRUE) + ENDIF (ZSTD_INCLUDE_DIR) + +- FIND_PATH(ZSTD_INCLUDE_DIR zstd.h) +- FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd libzstd) ++ IF(UNIX) ++ FIND_PACKAGE(PkgConfig QUIET) ++ PKG_SEARCH_MODULE(PC_ZSTD libzstd) ++ ENDIF() ++ ++ FIND_PATH(ZSTD_INCLUDE_DIR zstd.h HINTS ${PC_ZSTD_INCLUDEDIR} ${PC_ZSTD_INCLUDE_DIRS}) ++ FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd HINTS ${PC_ZSTD_LIBDIR} ${PC_ZSTD_LIBRARY_DIRS}) + INCLUDE(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZSTD DEFAULT_MSG ZSTD_LIBRARY ZSTD_INCLUDE_DIR) + ELSE(ENABLE_ZSTD)