From f700d9445983fb28fbc4ccf797c6e574acf523f3 Mon Sep 17 00:00:00 2001
From: John Freeman <jfreeman08@gmail.com>
Date: Wed, 13 Mar 2024 21:45:47 -0500
Subject: [PATCH] Add patch to ignore thirdparty.inc

---
 recipes/rocksdb/all/conandata.yml                |  3 +++
 .../patches/6.29.5-0002-exclude-thirdparty.patch | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 recipes/rocksdb/all/patches/6.29.5-0002-exclude-thirdparty.patch

diff --git a/recipes/rocksdb/all/conandata.yml b/recipes/rocksdb/all/conandata.yml
index d4cc95fcc067b..86b42f79f0f4b 100644
--- a/recipes/rocksdb/all/conandata.yml
+++ b/recipes/rocksdb/all/conandata.yml
@@ -17,6 +17,9 @@ patches:
       patch_description: "Fix build with gcc 13 by including cstdint"
       patch_type: "portability"
       patch_source: "https://github.com/facebook/rocksdb/pull/11118"
+    - patch_file: "patches/6.29.5-0002-exclude-thirdparty.patch"
+      patch_description: "Do not include thirdparty.inc"
+      patch_type: "portability"
   "6.27.3":
     - patch_file: "patches/6.27.3-0001-add-include-cstdint-for-gcc-13.patch"
       patch_description: "Fix build with gcc 13 by including cstdint"
diff --git a/recipes/rocksdb/all/patches/6.29.5-0002-exclude-thirdparty.patch b/recipes/rocksdb/all/patches/6.29.5-0002-exclude-thirdparty.patch
new file mode 100644
index 0000000000000..fb0dd0c46b4f2
--- /dev/null
+++ b/recipes/rocksdb/all/patches/6.29.5-0002-exclude-thirdparty.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ec59d4491..35577c998 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -101 +100,0 @@ if(MSVC)
+-  option(WITH_GFLAGS "build with GFlags" OFF)
+@@ -103,2 +102,2 @@ if(MSVC)
+-  include(${CMAKE_CURRENT_SOURCE_DIR}/thirdparty.inc)
+-else()
++endif()
++
+@@ -117 +116 @@ else()
+-  if(MINGW)
++  if(MINGW OR MSVC)
+@@ -183 +181,0 @@ else()
+-endif()