Re: [PR PATCH] [Updated] rocksdb: update to 7.4.3.

[motorto <motorto@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1027 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages rocksdb-7.4.3
https://github.com/void-linux/void-packages/pull/38245

rocksdb: update to 7.4.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **Briefly** (recompiled neomutt and used it fine)

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{glibc,musl}

I have also linked rockdb with others compression libraries.

Not sure if another packages need to be rebuilt as well because of the SONAME update, need help on a good way to find this. 
To find the packages that needed to be recompiled I simply used `grep -R rocksdb-devel srcpkgs/` not sure if this is the correct way to do it.

Can't make armv6l work, going to need help on this arch.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/38245.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rocksdb-7.4.3-38245.patch --]
[-- Type: text/x-diff, Size: 5724 bytes --]

From 186c84fe8f2737e3c47b6d617e96d303bb8c6de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 25 Jul 2022 12:43:40 +0100
Subject: [PATCH 1/2] rocksdb: update to 7.4.3.

---
 srcpkgs/rocksdb/patches/no-powerpc-mcpu.patch | 31 +++++++++++++++++++
 srcpkgs/rocksdb/patches/toku_time.patch       | 31 +++++++++++++++++++
 srcpkgs/rocksdb/template                      | 11 ++++---
 3 files changed, 68 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/rocksdb/patches/no-powerpc-mcpu.patch
 create mode 100644 srcpkgs/rocksdb/patches/toku_time.patch

diff --git a/srcpkgs/rocksdb/patches/no-powerpc-mcpu.patch b/srcpkgs/rocksdb/patches/no-powerpc-mcpu.patch
new file mode 100644
index 000000000000..429c75a3eb3b
--- /dev/null
+++ b/srcpkgs/rocksdb/patches/no-powerpc-mcpu.patch
@@ -0,0 +1,31 @@
+https://git.alpinelinux.org/aports/plain/community/rocksdb/40-no-powerpc-mcpu.patch
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -238,25 +238,6 @@
+ endif()
+ 
+ include(CheckCCompilerFlag)
+-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
+-  CHECK_C_COMPILER_FLAG("-mcpu=power9" HAS_POWER9)
+-  if(HAS_POWER9)
+-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcpu=power9 -mtune=power9")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=power9 -mtune=power9")
+-  else()
+-    CHECK_C_COMPILER_FLAG("-mcpu=power8" HAS_POWER8)
+-    if(HAS_POWER8)
+-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcpu=power8 -mtune=power8")
+-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=power8 -mtune=power8")
+-    endif(HAS_POWER8)
+-  endif(HAS_POWER9)
+-  CHECK_C_COMPILER_FLAG("-maltivec" HAS_ALTIVEC)
+-  if(HAS_ALTIVEC)
+-    message(STATUS " HAS_ALTIVEC yes")
+-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maltivec")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maltivec")
+-  endif(HAS_ALTIVEC)
+-endif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
+ 
+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64|AARCH64")
+         CHECK_C_COMPILER_FLAG("-march=armv8-a+crc+crypto" HAS_ARMV8_CRC)
+
diff --git a/srcpkgs/rocksdb/patches/toku_time.patch b/srcpkgs/rocksdb/patches/toku_time.patch
new file mode 100644
index 000000000000..30ac4b81b1e8
--- /dev/null
+++ b/srcpkgs/rocksdb/patches/toku_time.patch
@@ -0,0 +1,31 @@
+https://git.alpinelinux.org/aports/plain/community/rocksdb/30-toku_time.patch
+
+arm part from: https://github.com/facebook/rocksdb/issues/8609#issuecomment-1009572506
+
+--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
++++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
+@@ -58,9 +58,6 @@
+ #include <stdint.h>
+ #include <sys/time.h>
+ #include <time.h>
+-#if defined(__powerpc__)
+-#include <sys/platform/ppc.h>
+-#endif
+ 
+ #if 0
+ static inline float toku_tdiff (struct timeval *a, struct timeval *b) {
+@@ -131,8 +128,12 @@
+   uint64_t result;
+   __asm __volatile__("mrs %[rt], cntvct_el0" : [ rt ] "=r"(result));
+   return result;
++#elif  defined(__arm__)
++  uint32_t lo, hi;
++  __asm __volatile__("mrrc p15, 1, %[lo], %[hi], c14" : [ lo ] "=r" (lo), [hi] "=r" (hi));
++  return (uint64_t)hi << 32 | lo;
+ #elif defined(__powerpc__)
+-  return __ppc_get_timebase();
++  return __builtin_ppc_get_timebase();
+ #elif defined(__s390x__)
+   uint64_t result;
+   asm volatile("stckf %0" : "=Q"(result) : : "cc");
+
diff --git a/srcpkgs/rocksdb/template b/srcpkgs/rocksdb/template
index 2ae7db40ab91..4bfa7f4c89ef 100644
--- a/srcpkgs/rocksdb/template
+++ b/srcpkgs/rocksdb/template
@@ -1,16 +1,17 @@
 # Template file for 'rocksdb'
 pkgname=rocksdb
-version=5.18.3
-revision=2
+version=7.4.3
+revision=1
 build_style=cmake
-configure_args="-DPORTABLE=1 -DWITH_TESTS=0 -DUSE_RTTI=0 -DWITH_LZ4=1"
-makedepends="liblz4-devel"
+configure_args="-DPORTABLE=1 -DWITH_TESTS=0 -DUSE_RTTI=0 -DWITH_LZ4=1 -DWITH_ZLIB=1 -DWITH_BZ2=1 -DWITH_SNAPPY=1 -DWITH_ZSTD=1"
+makedepends="liblz4-devel gflags-devel snappy-devel libzstd-devel bzip2-devel zlib-devel"
 short_desc="RocksDB is a embeddable, persistent key-value store for fast storage"
 maintainer="magenbluten <mb0@codemonkey.cc>"
 license="GPL-2.0-or-later, Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/facebook/rocksdb"
+changelog="https://raw.githubusercontent.com/facebook/rocksdb/main/HISTORY.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=7fb6738263d3f2b360d7468cf2ebe333f3109f3ba1ff80115abd145d75287254
+checksum=ca1fedc931d2232603a84db6120b6e9158bc1f14ef113291624dc357500e48ab
 CFLAGS=-DNDEBUG
 CXXFLAGS=-DNDEBUG
 

From ac28b19d98926cfc39439b3b46a693799827d9dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 25 Jul 2022 12:44:10 +0100
Subject: [PATCH 2/2] neomutt: rebuild for rocksdb-7.3.4.

---
 common/shlibs            | 2 +-
 srcpkgs/neomutt/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c3dd63f542db..db33cc4d63d8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3625,7 +3625,7 @@ libOsiCommonTests.so.1 libClp-1.16.11_1
 libOsi.so.1 libClp-1.16.11_1
 libOGDF.so libogdf-2018.03_1
 libCOIN.so libogdf-2018.03_1
-librocksdb.so.5 rocksdb-5.17.2_1
+librocksdb.so.7 rocksdb-7.4.3_1
 libfrr.so.0 libfrr-6.0_1
 libkaccounts.so.2 kaccounts-integration-20.04.3_1
 libfrrospfapiclient.so.0 libfrrospfapiclient-6.0_1
diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index a2320a780b2e..c69c15807185 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20220429
-revision=1
+revision=2
 create_wrksrc=true
 build_wrksrc="${pkgname}-${version}"
 build_style=configure