From 150a220d9210d29776fa1f10789daa7985883ea4 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 19 Nov 2022 21:30:56 +0900 Subject: [PATCH] librocksdb: Bump to 7.7.3 --- packages/librocksdb/build.sh | 5 ++--- packages/librocksdb/rocksdb.pc.in.patch | 10 ++++++++++ packages/librocksdb/tools-db_bench_tool.cc.patch | 11 ----------- packages/librocksdb/tools-rdb-unit_test.js.patch | 11 ----------- 4 files changed, 12 insertions(+), 25 deletions(-) create mode 100644 packages/librocksdb/rocksdb.pc.in.patch delete mode 100644 packages/librocksdb/tools-db_bench_tool.cc.patch delete mode 100644 packages/librocksdb/tools-rdb-unit_test.js.patch diff --git a/packages/librocksdb/build.sh b/packages/librocksdb/build.sh index 8af8b47f77..1957768fe5 100644 --- a/packages/librocksdb/build.sh +++ b/packages/librocksdb/build.sh @@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="A persistent key-value store for flash and RAM storage" TERMUX_PKG_LICENSE="GPL-2.0, Apache-2.0, BSD 3-Clause" TERMUX_PKG_LICENSE_FILE="COPYING, LICENSE.Apache, LICENSE.leveldb" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=6.27.3 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=7.7.3 TERMUX_PKG_SRCURL=https://github.com/facebook/rocksdb/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=ee29901749b9132692b26f0a6c1d693f47d1a9ed8e3771e60556afe80282bf58 +TERMUX_PKG_SHA256=b8ac9784a342b2e314c821f6d701148912215666ac5e9bdbccd93cf3767cb611 TERMUX_PKG_DEPENDS="gflags, libc++" TERMUX_PKG_BUILD_DEPENDS="gflags-static" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/librocksdb/rocksdb.pc.in.patch b/packages/librocksdb/rocksdb.pc.in.patch new file mode 100644 index 0000000000..bfe5cc2135 --- /dev/null +++ b/packages/librocksdb/rocksdb.pc.in.patch @@ -0,0 +1,10 @@ +--- a/rocksdb.pc.in ++++ b/rocksdb.pc.in +@@ -1,6 +1,6 @@ + prefix="@CMAKE_INSTALL_PREFIX@" + includedir="${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" +-libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@" ++libdir="@CMAKE_INSTALL_LIBDIR@" + + Name: @PROJECT_NAME@ + Description: @PROJECT_DESCRIPTION@ diff --git a/packages/librocksdb/tools-db_bench_tool.cc.patch b/packages/librocksdb/tools-db_bench_tool.cc.patch deleted file mode 100644 index 975ec19ea6..0000000000 --- a/packages/librocksdb/tools-db_bench_tool.cc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tools/db_bench_tool.cc -+++ b/tools/db_bench_tool.cc -@@ -6442,7 +6442,7 @@ - // Pick a Iterator to use - size_t db_idx_to_use = - (db_.db == nullptr) -- ? (size_t{thread->rand.Next()} % multi_dbs_.size()) -+ ? (size_t{static_cast(thread->rand.Next())} % multi_dbs_.size()) - : 0; - std::unique_ptr single_iter; - Iterator* iter_to_use; diff --git a/packages/librocksdb/tools-rdb-unit_test.js.patch b/packages/librocksdb/tools-rdb-unit_test.js.patch deleted file mode 100644 index 6926a8b0e6..0000000000 --- a/packages/librocksdb/tools-rdb-unit_test.js.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tools/rdb/unit_test.js -+++ b/tools/rdb/unit_test.js -@@ -4,7 +4,7 @@ - exec = require('child_process').exec - util = require('util') - --DB_NAME = '/tmp/rocksdbtest-' + process.getuid() -+DB_NAME = '@TERMUX_PREFIX@/tmp/rocksdbtest-' + process.getuid() - - a = RDB() - assert.equal(a.open(DB_NAME, ['b']), false)