meta-starlingx/meta-stx-virt/recipes-extended/ceph/ceph-13.2.2/0001-Correct-the-path-to-find-version.h-in-rocksdb.patch

   1 From a53605694d5301b7bb543464b17f74bbbd35d372 Mon Sep 17 00:00:00 2001
   2 From: Dengke Du <dengke.du@windriver.com>
   3 Date: Tue, 28 Aug 2018 10:04:40 +0800
   4 Subject: [PATCH] Correct the path to find version.h in rocksdb
   5
   6 Signed-off-by: Dengke Du <dengke.du@windriver.com>
   7 ---
   8  cmake/modules/Findrocksdb.cmake | 10 +++++-----
   9  1 file changed, 5 insertions(+), 5 deletions(-)
  10
  11 diff --git a/cmake/modules/Findrocksdb.cmake b/cmake/modules/Findrocksdb.cmake
  12 index f8369f7..36b67ea 100644
  13 --- a/cmake/modules/Findrocksdb.cmake
  14 +++ b/cmake/modules/Findrocksdb.cmake
  15 @@ -9,17 +9,17 @@
  16  #  ROCKSDB_VERSION_MINOR
  17  #  ROCKSDB_VERSION_PATCH
  18
  19 -find_path(ROCKSDB_INCLUDE_DIR rocksdb/db.h)
  20 +find_path(ROCKSDB_INCLUDE_DIR rocksdb/db.h ${CMAKE_SYSROOT})
  21
  22 -find_library(ROCKSDB_LIBRARIES rocksdb)
  23 +find_library(ROCKSDB_LIBRARIES rocksdb ${CMAKE_SYSROOT})
  24
  25  if(ROCKSDB_INCLUDE_DIR AND EXISTS "${ROCKSDB_INCLUDE_DIR}/rocksdb/version.h")
  26    foreach(ver "MAJOR" "MINOR" "PATCH")
  27 -    file(STRINGS "${ROCKSDB_INCLUDE_DIR}/version.h" ROCKSDB_VER_${ver}_LINE
  28 +    file(STRINGS "${ROCKSDB_INCLUDE_DIR}/rocksdb/version.h" ROCKSDB_VER_${ver}_LINE
  29        REGEX "^#define[ \t]+ROCKSDB_${ver}[ \t]+[0-9]+$")
  30      string(REGEX REPLACE "^#define[ \t]+ROCKSDB_${ver}[ \t]+([0-9]+)$"
  31 -      "\\1" ROCKSDB_VERSION_${ver} "${ROCKDB_VER_${ver}_LINE}")
  32 -    unset(${ROCKDB_VER_${ver}_LINE})
  33 +      "\\1" ROCKSDB_VERSION_${ver} "${ROCKSDB_VER_${ver}_LINE}")
  34 +    unset(ROCKSDB_VER_${ver}_LINE)
  35    endforeach()
  36    set(ROCKSDB_VERSION_STRING
  37      "${ROCKSDB_VERSION_MAJOR}.${ROCKSDB_VERSION_MINOR}.${ROCKSDB_VERSION_PATCH}")
  38 --
  39 2.7.4
  40