summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-01-25 20:28:51 -0800
committerKhem Raj <raj.khem@gmail.com>2023-01-25 23:18:05 -0800
commitb5d0bba01197bf34f06968120b494c298dcc0f82 (patch)
treef52c107abb10bd8dde73374f83685a8da6480fa8
parentad2a76cf368abc9b25f342acda86d84c028a7bbe (diff)
downloadmeta-openembedded-b5d0bba01197bf34f06968120b494c298dcc0f82.tar.gz
rocksdb: Upgrade to 7.9.2
Refresh patches Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch2
-rw-r--r--meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch2
-rw-r--r--meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch2
-rw-r--r--meta-oe/recipes-dbs/rocksdb/files/ppc64.patch2
-rw-r--r--meta-oe/recipes-dbs/rocksdb/rocksdb_7.9.2.bb (renamed from meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb)4
5 files changed, 6 insertions, 6 deletions
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>
37+#include <cstdint> 37+#include <cstdint>
38 #include <string> 38 #include <string>
39 #include <vector> 39 #include <vector>
40 #include "rocksdb/status.h" 40
41--- a/table/block_based/data_block_hash_index.h 41--- a/table/block_based/data_block_hash_index.h
42+++ b/table/block_based/data_block_hash_index.h 42+++ b/table/block_based/data_block_hash_index.h
43@@ -5,6 +5,7 @@ 43@@ -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>
27 27
28--- a/CMakeLists.txt 28--- a/CMakeLists.txt
29+++ b/CMakeLists.txt 29+++ b/CMakeLists.txt
30@@ -1000,7 +1000,12 @@ option(ROCKSDB_BUILD_SHARED "Build share 30@@ -1057,7 +1057,12 @@ set(ROCKSDB_SHARED_LIB rocksdb-shared${A
31 if(WIN32) 31 if(WIN32)
32 set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib) 32 set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
33 else() 33 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]
13 13
14--- a/CMakeLists.txt 14--- a/CMakeLists.txt
15+++ b/CMakeLists.txt 15+++ b/CMakeLists.txt
16@@ -153,12 +153,7 @@ else() 16@@ -154,12 +154,7 @@ else()
17 if(WITH_BZ2) 17 if(WITH_BZ2)
18 find_package(BZip2 REQUIRED) 18 find_package(BZip2 REQUIRED)
19 add_definitions(-DBZIP2) 19 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>
14 14
15@@ -131,8 +131,12 @@ static inline tokutime_t toku_time_now(v 15@@ -131,8 +131,12 @@ static inline tokutime_t toku_time_now(v
16 uint64_t result; 16 uint64_t result;
17 __asm __volatile__("mrs %[rt], cntvct_el0" : [ rt ] "=r"(result)); 17 __asm __volatile__("mrs %[rt], cntvct_el0" : [rt] "=r"(result));
18 return result; 18 return result;
19-#elif defined(__powerpc__) 19-#elif defined(__powerpc__)
20+#elif defined(__powerpc__) && defined(__GLIBC__) 20+#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
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 \
6 file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 6 file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
7 file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837" 7 file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837"
8 8
9SRCREV = "540d5aae516265170564ec27b3e67a54a11b7045" 9SRCREV = "444b3f4845dd01b0d127c4b420fdd3b50ad56682"
10SRCBRANCH = "7.5.fb" 10SRCBRANCH = "7.9.fb"
11 11
12SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https \ 12SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https \
13 file://0001-cmake-Add-check-for-atomic-support.patch \ 13 file://0001-cmake-Add-check-for-atomic-support.patch \