diff options
author | Tony Lambiris | 2021-09-07 21:31:27 -0400 |
---|---|---|
committer | Tony Lambiris | 2021-09-07 21:31:27 -0400 |
commit | 2561f719ca3307b719a078a2141f25e1bb585e76 (patch) | |
tree | 95c94263fbc584308e11fe337d521dd5b9df75a8 | |
parent | 11fc5b1b5fc66812fb3c2e65b567e2b3b3df42a1 (diff) | |
download | aur-2561f719ca3307b719a078a2141f25e1bb585e76.tar.gz |
Version bump, remove old patch file.
-rw-r--r-- | .SRCINFO | 7 | ||||
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | PKGBUILD | 30 | ||||
-rw-r--r-- | fix-compile-warnings-treated-as-errors-for-gcc9.patch | 59 |
4 files changed, 19 insertions, 79 deletions
@@ -1,6 +1,6 @@ pkgbase = rocksdb-lite pkgdesc = Embedded key-value store for fast storage (lite version) - pkgver = 6.6.4 + pkgver = 6.22.1 pkgrel = 1 url = http://rocksdb.org arch = i686 @@ -15,8 +15,7 @@ pkgbase = rocksdb-lite depends = gcc-libs provides = rocksdb conflicts = rocksdb - source = https://github.com/facebook/rocksdb/archive/v6.6.4.tar.gz - sha256sums = feab859ee355fbe7beffd7085904b63f560417f450f83cc34310e6dadff936f6 + source = https://github.com/facebook/rocksdb/archive/v6.22.1.tar.gz + sha256sums = 2df8f34a44eda182e22cf84dee7a14f17f55d305ff79c06fb3cd1e5f8831e00d pkgname = rocksdb-lite - diff --git a/.gitignore b/.gitignore index 6d9731b79380..60793a475d53 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ src pkg v*.tar.gz -*pkg.tar.xz +*.pkg.tar.* tags @@ -1,7 +1,7 @@ # Maintainer: Tony <tony@libpcap.net> pkgname=rocksdb-lite -pkgver=6.6.4 +pkgver=6.22.1 pkgrel=1 pkgdesc='Embedded key-value store for fast storage (lite version)' arch=(i686 x86_64) @@ -12,30 +12,30 @@ checkdepends=('python2') conflicts=('rocksdb') provides=('rocksdb') source=("https://github.com/facebook/rocksdb/archive/v${pkgver}.tar.gz") -sha256sums=('feab859ee355fbe7beffd7085904b63f560417f450f83cc34310e6dadff936f6') +sha256sums=('2df8f34a44eda182e22cf84dee7a14f17f55d305ff79c06fb3cd1e5f8831e00d') prepare() { - cd "${srcdir}/rocksdb-${pkgver}" + cd "${srcdir}/rocksdb-${pkgver}" - sed -e 's/\bpython\b/python2/' -i Makefile - if [ "$CARCH" == "armv6h" ]; then - sed -e 's/-momit-leaf-frame-pointer//' -i Makefile - fi + sed -e 's/\bpython\b/python2/' -i Makefile + if [ "$CARCH" == "armv6h" ]; then + sed -e 's/-momit-leaf-frame-pointer//' -i Makefile + fi } build() { - cd "${srcdir}/rocksdb-${pkgver}" + cd "${srcdir}/rocksdb-${pkgver}" - env USE_RTTI=1 make shared_lib CFLAGS='-DROCKSDB_LITE -DROCKSDB_USE_RTTI' + env USE_RTTI=1 make shared_lib CFLAGS='-DROCKSDB_LITE -DROCKSDB_USE_RTTI' } package() { - cd "${srcdir}/rocksdb-${pkgver}" + cd "${srcdir}/rocksdb-${pkgver}" - install -dm755 "${pkgdir}/usr/include" - cp -r include/rocksdb "${pkgdir}/usr/include" + install -dm755 "${pkgdir}/usr/include" + cp -r include/rocksdb "${pkgdir}/usr/include" - install -Dm755 librocksdb.so "${pkgdir}/usr/lib/librocksdb_lite.so" - install -Dm644 LICENSE.Apache "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.Apache" - install -Dm644 LICENSE.leveldb "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.leveldb" + install -Dm755 librocksdb.so "${pkgdir}/usr/lib/librocksdb_lite.so" + install -Dm644 LICENSE.Apache "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.Apache" + install -Dm644 LICENSE.leveldb "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.leveldb" } diff --git a/fix-compile-warnings-treated-as-errors-for-gcc9.patch b/fix-compile-warnings-treated-as-errors-for-gcc9.patch deleted file mode 100644 index 2bdbcd4a6bed..000000000000 --- a/fix-compile-warnings-treated-as-errors-for-gcc9.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/db/internal_stats.h b/db/internal_stats.h -index 20fb07f485..ebe90d574d 100644 ---- a/db/internal_stats.h -+++ b/db/internal_stats.h -@@ -237,6 +237,28 @@ class InternalStats { - } - } - -+ CompactionStats& operator=(const CompactionStats& c) { -+ micros = c.micros; -+ cpu_micros = c.cpu_micros; -+ bytes_read_non_output_levels = c.bytes_read_non_output_levels; -+ bytes_read_output_level = c.bytes_read_output_level; -+ bytes_written = c.bytes_written; -+ bytes_moved = c.bytes_moved; -+ num_input_files_in_non_output_levels = -+ c.num_input_files_in_non_output_levels; -+ num_input_files_in_output_level = c.num_input_files_in_output_level; -+ num_output_files = c.num_output_files; -+ num_input_records = c.num_input_records; -+ num_dropped_records = c.num_dropped_records; -+ count = c.count; -+ -+ int num_of_reasons = static_cast<int>(CompactionReason::kNumOfReasons); -+ for (int i = 0; i < num_of_reasons; i++) { -+ counts[i] = c.counts[i]; -+ } -+ return *this; -+ } -+ - void Clear() { - this->micros = 0; - this->cpu_micros = 0; -diff --git a/db/version_edit.h b/db/version_edit.h -index e1857b37fc..4a93db34e1 100644 ---- a/db/version_edit.h -+++ b/db/version_edit.h -@@ -52,6 +52,8 @@ struct FileDescriptor { - smallest_seqno(_smallest_seqno), - largest_seqno(_largest_seqno) {} - -+ FileDescriptor(const FileDescriptor& fd) { *this=fd; } -+ - FileDescriptor& operator=(const FileDescriptor& fd) { - table_reader = fd.table_reader; - packed_number_and_path_id = fd.packed_number_and_path_id; -diff --git a/utilities/persistent_cache/persistent_cache_util.h b/utilities/persistent_cache/persistent_cache_util.h -index 214bb5875d..254c038f98 100644 ---- a/utilities/persistent_cache/persistent_cache_util.h -+++ b/utilities/persistent_cache/persistent_cache_util.h -@@ -48,7 +48,7 @@ class BoundedQueue { - T t = std::move(q_.front()); - size_ -= t.Size(); - q_.pop_front(); -- return std::move(t); -+ return t; - } - - size_t Size() const { |