diff mbox series

[meta-oe,03/13] rocksdb: Upgrade to 7.9.2

Message ID 20230126071735.2444745-3-raj.khem@gmail.com
State New
Headers show
Series [meta-oe,01/13] vulkan-cts,opengl-es-cts: Fix build with gcc-13 | expand

Commit Message

Khem Raj Jan. 26, 2023, 7:17 a.m. UTC 
Refresh patches

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../files/0001-Add-missing-includes-cstdint-and-cstdio.patch  | 2 +-
 .../files/0001-cmake-Add-check-for-atomic-support.patch       | 2 +-
 .../files/0001-cmake-Use-exported-target-for-bz2.patch        | 2 +-
 meta-oe/recipes-dbs/rocksdb/files/ppc64.patch                 | 2 +-
 .../rocksdb/{rocksdb_7.5.3.bb => rocksdb_7.9.2.bb}            | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename meta-oe/recipes-dbs/rocksdb/{rocksdb_7.5.3.bb => rocksdb_7.9.2.bb} (96%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch
index 1c505f7e18..a177ce28b9 100644
--- a/meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch
+++ b/meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch
@@ -37,7 +37,7 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
 +#include <cstdint>
  #include <string>
  #include <vector>
- #include "rocksdb/status.h"
+ 
 --- a/table/block_based/data_block_hash_index.h
 +++ b/table/block_based/data_block_hash_index.h
 @@ -5,6 +5,7 @@
diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch
index 2906100dee..0fe9c12766 100644
--- a/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch
+++ b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch
@@ -27,7 +27,7 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1000,7 +1000,12 @@ option(ROCKSDB_BUILD_SHARED "Build share
+@@ -1057,7 +1057,12 @@ set(ROCKSDB_SHARED_LIB rocksdb-shared${A
  if(WIN32)
    set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
  else()
diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch
index 139312a298..706e0868e5 100644
--- a/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch
+++ b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch
@@ -13,7 +13,7 @@  Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/7541]
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -153,12 +153,7 @@ else()
+@@ -154,12 +154,7 @@ else()
    if(WITH_BZ2)
      find_package(BZip2 REQUIRED)
      add_definitions(-DBZIP2)
diff --git a/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch b/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch
index 45deef338c..211c1c720b 100644
--- a/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch
+++ b/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch
@@ -14,7 +14,7 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
  
 @@ -131,8 +131,12 @@ static inline tokutime_t toku_time_now(v
    uint64_t result;
-   __asm __volatile__("mrs %[rt], cntvct_el0" : [ rt ] "=r"(result));
+   __asm __volatile__("mrs %[rt], cntvct_el0" : [rt] "=r"(result));
    return result;
 -#elif defined(__powerpc__)
 +#elif defined(__powerpc__) && defined(__GLIBC__)
diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_7.9.2.bb
similarity index 96%
rename from meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb
rename to meta-oe/recipes-dbs/rocksdb/rocksdb_7.9.2.bb
index b9416988cf..29f234d6ec 100644
--- a/meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb
+++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_7.9.2.bb
@@ -6,8 +6,8 @@  LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \
                     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837"
 
-SRCREV = "540d5aae516265170564ec27b3e67a54a11b7045"
-SRCBRANCH = "7.5.fb"
+SRCREV = "444b3f4845dd01b0d127c4b420fdd3b50ad56682"
+SRCBRANCH = "7.9.fb"
 
 SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https \
            file://0001-cmake-Add-check-for-atomic-support.patch \