2 files changed, 44 insertions, 0 deletions

diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-Findzstd.cmake-support-pkg-config-based-zstd-detecti.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-Findzstd.cmake-support-pkg-config-based-zstd-detecti.patch
new file mode 100644
index 0000000000..dac61773e5
--- /dev/null
+++ b/meta-oe/recipes-dbs/rocksdb/files/0001-Findzstd.cmake-support-pkg-config-based-zstd-detecti.patch
@@ -0,0 +1,43 @@
+From 7509f5d4bfcd8ba8bc0ad8c2054b2b336d8c0c9f Mon Sep 17 00:00:00 2001
+From: Minjae Kim <mj.kim@mercedes-benz.com>
+Date: Mon, 9 Feb 2026 20:34:53 +0000
+Subject: [PATCH] Findzstd.cmake: support pkg-config based zstd detection
+
+In Yocto builds, zstd is built via Makefile and does not install
+CMake package configuration files. As a result, Findzstd.cmake
+fails to detect ZSTD_INCLUDE_DIRS.
+
+Add pkg-config based detection as a fallback to properly locate
+zstd headers and libraries.
+
+fix error:
+|   Could NOT find zstd (missing: ZSTD_INCLUDE_DIRS)
+| Call Stack (most recent call first):
+
+
+Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/14308]
+
+Signed-off-by: Minjae Kim <flowergom@gmail.com>
+
+---
+ cmake/modules/Findzstd.cmake | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cmake/modules/Findzstd.cmake b/cmake/modules/Findzstd.cmake
+index e82fa148c8..f160be9ae0 100644
+--- a/cmake/modules/Findzstd.cmake
++++ b/cmake/modules/Findzstd.cmake
+@@ -14,6 +14,10 @@ find_library(ZSTD_LIBRARIES
+   HINTS ${zstd_ROOT_DIR}/lib)
+ 
+ include(FindPackageHandleStandardArgs)
++find_package(PkgConfig QUIET)
++if(PKG_CONFIG_FOUND)
++  pkg_check_modules(ZSTD QUIET libzstd)
++endif()
+ find_package_handle_standard_args(zstd DEFAULT_MSG ZSTD_LIBRARIES ZSTD_INCLUDE_DIRS)
+ 
+ mark_as_advanced(
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_9.10.0.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_9.10.0.bb
index c6d5a0ec7f..d8ba31e8ca 100644
--- a/meta-oe/recipes-dbs/rocksdb/rocksdb_9.10.0.bb
+++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_9.10.0.bb
@@ -22,6 +22,7 @@ SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=htt
            file://run-ptest \
            file://0001-Fix-build-error-with-gcc-13-by-adding-cstdint-header.patch \
            file://0001-checkpoint.h-Add-missing-includes-cstdint.patch \
+           file://0001-Findzstd.cmake-support-pkg-config-based-zstd-detecti.patch \
           "
 
 SRC_URI:append:riscv32 = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch"