Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Rocksdb 7.4.3
@ 2022-07-24 15:03 motorto
  2022-07-24 15:27 ` [PR PATCH] [Updated] rocksdb: update to 7.4.3 motorto
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: motorto @ 2022-07-24 15:03 UTC (permalink / raw)
  To: ml

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

There is a new 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 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.

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: 2680 bytes --]

From a515e03010ccccb251234fb1a82eefdaa33362e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 24 Jul 2022 13:39:19 +0100
Subject: [PATCH 1/2] rocksdb: update to 7.4.3.

---
 srcpkgs/rocksdb/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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 e1c7119d755286f4eed652af1c28d73286b79991 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 24 Jul 2022 13:41:51 +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 c0b708dd7a3d..66ce03ff34c1 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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] rocksdb: update to 7.4.3.
  2022-07-24 15:03 [PR PATCH] Rocksdb 7.4.3 motorto
@ 2022-07-24 15:27 ` motorto
  2022-07-24 16:01 ` motorto
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2022-07-24 15:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 975 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 -->

[ci skip] for now

#### 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.

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: 3960 bytes --]

From 2486c33eae59000075ed5032c4a3c39d6188fea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 24 Jul 2022 13:39:19 +0100
Subject: [PATCH 1/2] rocksdb: update to 7.4.3.

---
 srcpkgs/rocksdb/patches/toku_time.patch | 18 ++++++++++++++++++
 srcpkgs/rocksdb/template                | 11 ++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/rocksdb/patches/toku_time.patch

diff --git a/srcpkgs/rocksdb/patches/toku_time.patch b/srcpkgs/rocksdb/patches/toku_time.patch
new file mode 100644
index 000000000000..6d87823f7aea
--- /dev/null
+++ b/srcpkgs/rocksdb/patches/toku_time.patch
@@ -0,0 +1,18 @@
+Taken from https://github.com/facebook/rocksdb/issues/8609https://github.com/facebook/rocksdb/issues/8609
+
+diff --git a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
+index 225e3fa72..cd5f935f1 100644
+--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
++++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
+@@ -131,6 +131,10 @@ static inline tokutime_t toku_time_now(void) {
+   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();
+ #elif defined(__s390x__)
+
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 748808cae6209198c3e3f5f061431476a45e03a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 24 Jul 2022 13:41:51 +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 c0b708dd7a3d..66ce03ff34c1 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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] rocksdb: update to 7.4.3.
  2022-07-24 15:03 [PR PATCH] Rocksdb 7.4.3 motorto
  2022-07-24 15:27 ` [PR PATCH] [Updated] rocksdb: update to 7.4.3 motorto
@ 2022-07-24 16:01 ` motorto
  2022-07-24 17:02 ` motorto
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2022-07-24 16:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1123 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.

Added patch for arm build but I don't have any hardware with that could someone try it (I don't want to clog the ci-build because it takes some time to build ~30min)

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: 4146 bytes --]

From 46c8261e5fc30ee7245edef9e48e906e7b7b5937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 24 Jul 2022 17:00:38 +0100
Subject: [PATCH 1/2] rocksdb: update to 7.4.3.

---
 srcpkgs/rocksdb/patches/toku_time.patch | 30 +++++++++++++++++++++++++
 srcpkgs/rocksdb/template                | 12 +++++-----
 2 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/rocksdb/patches/toku_time.patch

diff --git a/srcpkgs/rocksdb/patches/toku_time.patch b/srcpkgs/rocksdb/patches/toku_time.patch
new file mode 100644
index 000000000000..6ddc39535e14
--- /dev/null
+++ b/srcpkgs/rocksdb/patches/toku_time.patch
@@ -0,0 +1,30 @@
+https://git.alpinelinux.org/aports/plain/community/rocksdb/30-toku_time.patch
+Fixes build on arm
+
+--- 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..afd54103fc91 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
 
@@ -42,3 +43,4 @@ rocksdb-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+

From f576de958dd9a033a1cb86b87cad1b2a2f85730e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 24 Jul 2022 17:01:05 +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 c0b708dd7a3d..66ce03ff34c1 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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] rocksdb: update to 7.4.3.
  2022-07-24 15:03 [PR PATCH] Rocksdb 7.4.3 motorto
  2022-07-24 15:27 ` [PR PATCH] [Updated] rocksdb: update to 7.4.3 motorto
  2022-07-24 16:01 ` motorto
@ 2022-07-24 17:02 ` motorto
  2022-07-25 11:44 ` motorto
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2022-07-24 17:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1045 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.

Added patch for arm build but I don't have any hardware with that could someone try it 

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: 4068 bytes --]

From 97ce099fdf806df00a06a68221b8cd36181648c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 24 Jul 2022 17:00:38 +0100
Subject: [PATCH 1/2] rocksdb: update to 7.4.3.

---
 srcpkgs/rocksdb/patches/toku_time.patch | 30 +++++++++++++++++++++++++
 srcpkgs/rocksdb/template                | 11 ++++-----
 2 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/rocksdb/patches/toku_time.patch

diff --git a/srcpkgs/rocksdb/patches/toku_time.patch b/srcpkgs/rocksdb/patches/toku_time.patch
new file mode 100644
index 000000000000..6ddc39535e14
--- /dev/null
+++ b/srcpkgs/rocksdb/patches/toku_time.patch
@@ -0,0 +1,30 @@
+https://git.alpinelinux.org/aports/plain/community/rocksdb/30-toku_time.patch
+Fixes build on arm
+
+--- 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 54bad81a875c0f07e4e1e52ec6574c40be1c7ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 24 Jul 2022 17:01:05 +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 c0b708dd7a3d..66ce03ff34c1 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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] rocksdb: update to 7.4.3.
  2022-07-24 15:03 [PR PATCH] Rocksdb 7.4.3 motorto
                   ` (2 preceding siblings ...)
  2022-07-24 17:02 ` motorto
@ 2022-07-25 11:44 ` motorto
  2022-07-25 11:46 ` motorto
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2022-07-25 11:44 UTC (permalink / raw)
  To: ml

[-- 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: 5077 bytes --]

From e61764225692837fc1288cb7fd91696f4a151e2f 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 | 19 ++++++++++++
 srcpkgs/rocksdb/patches/toku_time.patch       | 31 +++++++++++++++++++
 srcpkgs/rocksdb/template                      | 11 ++++---
 3 files changed, 56 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..0fb0883423f8
--- /dev/null
+++ b/srcpkgs/rocksdb/patches/no-powerpc-mcpu.patch
@@ -0,0 +1,19 @@
+
+diff --git a/Makefile b/Makefile
+index a50c609..62bb975 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,12 +17,12 @@ MANPREFIX=$(MANPREFIX.$(PREFIX))
+ 
+ INCLUDES != pkg-config --cflags libnotify
+ CFLAGS_EXTRA = -pedantic -Wall -Wextra -Werror -Wno-unused-parameter -Os
+-CFLAGS := $(CFLAGS_EXTRA) -std=c11 $(INCLUDES)
++CFLAGS := $(CFLAGS_EXTRA) $(CFLAGS) -std=c11 $(INCLUDES)
+ 
+ LIBS != pkg-config --libs libnotify
+ LIBS := $(LIBS) -lm
+ LDFLAGS_EXTRA = -s
+-LDFLAGS := $(LIBS) $(LDFLAGS_EXTRA)
++LDFLAGS := $(LIBS) $(LDFLAGS_EXTRA) $(LDFLAGS)
+ 
+ 
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 6401ec783225c4cb110b1b052d5e667487c80c3d 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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] rocksdb: update to 7.4.3.
  2022-07-24 15:03 [PR PATCH] Rocksdb 7.4.3 motorto
                   ` (3 preceding siblings ...)
  2022-07-25 11:44 ` motorto
@ 2022-07-25 11:46 ` motorto
  2022-07-25 11:54 ` motorto
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2022-07-25 11:46 UTC (permalink / raw)
  To: ml

[-- 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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: rocksdb: update to 7.4.3.
  2022-07-24 15:03 [PR PATCH] Rocksdb 7.4.3 motorto
                   ` (4 preceding siblings ...)
  2022-07-25 11:46 ` motorto
@ 2022-07-25 11:54 ` motorto
  2022-08-19 14:54 ` [PR PATCH] [Updated] " motorto
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2022-07-25 11:54 UTC (permalink / raw)
  To: ml

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

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/38245#issuecomment-1193953462

Comment:
@q66  could you check if it builds on ppc with these patches ? 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] rocksdb: update to 7.4.3.
  2022-07-24 15:03 [PR PATCH] Rocksdb 7.4.3 motorto
                   ` (5 preceding siblings ...)
  2022-07-25 11:54 ` motorto
@ 2022-08-19 14:54 ` motorto
  2022-08-19 14:54 ` motorto
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2022-08-19 14:54 UTC (permalink / raw)
  To: ml

[-- 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: 3600 bytes --]

From 21233223ae6073a55cc4bfd726de8b6651c03e21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 19 Aug 2022 15:53:24 +0100
Subject: [PATCH] rocksdb: update to 7.4.5.

---
 common/shlibs                           |  2 +-
 srcpkgs/rocksdb/patches/toku_time.patch | 17 +++++++++++++++++
 srcpkgs/rocksdb/template                | 22 ++++++----------------
 3 files changed, 24 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/rocksdb/patches/toku_time.patch

diff --git a/common/shlibs b/common/shlibs
index 2e5258f3a243..e4f3fea89288 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3619,7 +3619,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.5
 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/rocksdb/patches/toku_time.patch b/srcpkgs/rocksdb/patches/toku_time.patch
new file mode 100644
index 000000000000..9ffe1390ed1d
--- /dev/null
+++ b/srcpkgs/rocksdb/patches/toku_time.patch
@@ -0,0 +1,17 @@
+From: https://github.com/facebook/rocksdb/issues/8609
+
+diff --git a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
+index 225e3fa72..cd5f935f1 100644
+--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
++++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
+@@ -131,6 +131,10 @@ static inline tokutime_t toku_time_now(void) {
+   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();
+ #elif defined(__s390x__)
diff --git a/srcpkgs/rocksdb/template b/srcpkgs/rocksdb/template
index 2ae7db40ab91..e2ef6f916c06 100644
--- a/srcpkgs/rocksdb/template
+++ b/srcpkgs/rocksdb/template
@@ -1,31 +1,21 @@
 # Template file for 'rocksdb'
 pkgname=rocksdb
-version=5.18.3
-revision=2
+version=7.4.5
+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"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=7fb6738263d3f2b360d7468cf2ebe333f3109f3ba1ff80115abd145d75287254
-CFLAGS=-DNDEBUG
-CXXFLAGS=-DNDEBUG
+checksum=af237cbdde7b7b7a0ee8a5858e9d49ed71964801cf768052ce0cdfd302943cc2
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
-# Use the C++17 feature to align new
-CXXFLAGS="-faligned-new -Wno-error=deprecated-copy -Wno-error=pessimizing-move"
-
-pre_configure() {
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		vsed -i CMakeLists.txt \
-			-e 's;target_link_libraries(${ROCKSDB_SHARED_LIB};& atomic;'
-	fi
-}
 
 post_install() {
 	vcopy "include/rocksdb/*" usr/include/rocksdb

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: rocksdb: update to 7.4.3.
  2022-07-24 15:03 [PR PATCH] Rocksdb 7.4.3 motorto
                   ` (6 preceding siblings ...)
  2022-08-19 14:54 ` [PR PATCH] [Updated] " motorto
@ 2022-08-19 14:54 ` motorto
  2022-08-19 14:55 ` [PR PATCH] [Updated] " motorto
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2022-08-19 14:54 UTC (permalink / raw)
  To: ml

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

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/38245#issuecomment-1193953462

Comment:
@q66  could you check if it builds on ppc with these patches ? 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] rocksdb: update to 7.4.3.
  2022-07-24 15:03 [PR PATCH] Rocksdb 7.4.3 motorto
                   ` (7 preceding siblings ...)
  2022-08-19 14:54 ` motorto
@ 2022-08-19 14:55 ` motorto
  2022-08-19 15:26 ` motorto
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2022-08-19 14:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1014 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.

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: 3634 bytes --]

From cb7acd89837c9465178b1e8e07d6eb8934038816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 19 Aug 2022 15:53:24 +0100
Subject: [PATCH] rocksdb: update to 7.4.5.

---
 common/shlibs                           |  2 +-
 srcpkgs/rocksdb/patches/toku_time.patch | 17 +++++++++++++++++
 srcpkgs/rocksdb/template                | 24 +++++++-----------------
 3 files changed, 25 insertions(+), 18 deletions(-)
 create mode 100644 srcpkgs/rocksdb/patches/toku_time.patch

diff --git a/common/shlibs b/common/shlibs
index 2e5258f3a243..e4f3fea89288 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3619,7 +3619,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.5
 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/rocksdb/patches/toku_time.patch b/srcpkgs/rocksdb/patches/toku_time.patch
new file mode 100644
index 000000000000..9ffe1390ed1d
--- /dev/null
+++ b/srcpkgs/rocksdb/patches/toku_time.patch
@@ -0,0 +1,17 @@
+From: https://github.com/facebook/rocksdb/issues/8609
+
+diff --git a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
+index 225e3fa72..cd5f935f1 100644
+--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
++++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
+@@ -131,6 +131,10 @@ static inline tokutime_t toku_time_now(void) {
+   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();
+ #elif defined(__s390x__)
diff --git a/srcpkgs/rocksdb/template b/srcpkgs/rocksdb/template
index 2ae7db40ab91..fa5aedff6d17 100644
--- a/srcpkgs/rocksdb/template
+++ b/srcpkgs/rocksdb/template
@@ -1,31 +1,21 @@
-# Template file for 'rocksdb'
+# Template file for 'rocksdb';
 pkgname=rocksdb
-version=5.18.3
-revision=2
+version=7.4.5
+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"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=7fb6738263d3f2b360d7468cf2ebe333f3109f3ba1ff80115abd145d75287254
-CFLAGS=-DNDEBUG
-CXXFLAGS=-DNDEBUG
+checksum=af237cbdde7b7b7a0ee8a5858e9d49ed71964801cf768052ce0cdfd302943cc2
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
-# Use the C++17 feature to align new
-CXXFLAGS="-faligned-new -Wno-error=deprecated-copy -Wno-error=pessimizing-move"
-
-pre_configure() {
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		vsed -i CMakeLists.txt \
-			-e 's;target_link_libraries(${ROCKSDB_SHARED_LIB};& atomic;'
-	fi
-}
 
 post_install() {
 	vcopy "include/rocksdb/*" usr/include/rocksdb

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] rocksdb: update to 7.4.3.
  2022-07-24 15:03 [PR PATCH] Rocksdb 7.4.3 motorto
                   ` (8 preceding siblings ...)
  2022-08-19 14:55 ` [PR PATCH] [Updated] " motorto
@ 2022-08-19 15:26 ` motorto
  2022-08-19 16:09 ` [PR PATCH] [Updated] rocksdb: update to 7.4.5 motorto
  2022-08-21 12:45 ` [PR PATCH] [Merged]: " leahneukirchen
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2022-08-19 15:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1014 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.

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: 4276 bytes --]

From d5cf997da150d034fdc5fa722886588d46d4438c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 19 Aug 2022 15:53:24 +0100
Subject: [PATCH 1/2] rocksdb: update to 7.4.5.

---
 common/shlibs                           |  2 +-
 srcpkgs/rocksdb/patches/toku_time.patch | 17 +++++++++++++++++
 srcpkgs/rocksdb/template                | 22 ++++++----------------
 3 files changed, 24 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/rocksdb/patches/toku_time.patch

diff --git a/common/shlibs b/common/shlibs
index 2e5258f3a243..e4f3fea89288 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3619,7 +3619,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.5
 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/rocksdb/patches/toku_time.patch b/srcpkgs/rocksdb/patches/toku_time.patch
new file mode 100644
index 000000000000..9ffe1390ed1d
--- /dev/null
+++ b/srcpkgs/rocksdb/patches/toku_time.patch
@@ -0,0 +1,17 @@
+From: https://github.com/facebook/rocksdb/issues/8609
+
+diff --git a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
+index 225e3fa72..cd5f935f1 100644
+--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
++++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
+@@ -131,6 +131,10 @@ static inline tokutime_t toku_time_now(void) {
+   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();
+ #elif defined(__s390x__)
diff --git a/srcpkgs/rocksdb/template b/srcpkgs/rocksdb/template
index 2ae7db40ab91..e2ef6f916c06 100644
--- a/srcpkgs/rocksdb/template
+++ b/srcpkgs/rocksdb/template
@@ -1,31 +1,21 @@
 # Template file for 'rocksdb'
 pkgname=rocksdb
-version=5.18.3
-revision=2
+version=7.4.5
+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"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=7fb6738263d3f2b360d7468cf2ebe333f3109f3ba1ff80115abd145d75287254
-CFLAGS=-DNDEBUG
-CXXFLAGS=-DNDEBUG
+checksum=af237cbdde7b7b7a0ee8a5858e9d49ed71964801cf768052ce0cdfd302943cc2
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
-# Use the C++17 feature to align new
-CXXFLAGS="-faligned-new -Wno-error=deprecated-copy -Wno-error=pessimizing-move"
-
-pre_configure() {
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		vsed -i CMakeLists.txt \
-			-e 's;target_link_libraries(${ROCKSDB_SHARED_LIB};& atomic;'
-	fi
-}
 
 post_install() {
 	vcopy "include/rocksdb/*" usr/include/rocksdb

From c028b26cf4a1a0ddd708432ed8ac7e6015c6c08b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 19 Aug 2022 16:26:00 +0100
Subject: [PATCH 2/2] neomutt: rebuild for rocksdb7.4.5

---
 srcpkgs/neomutt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] rocksdb: update to 7.4.5.
  2022-07-24 15:03 [PR PATCH] Rocksdb 7.4.3 motorto
                   ` (9 preceding siblings ...)
  2022-08-19 15:26 ` motorto
@ 2022-08-19 16:09 ` motorto
  2022-08-21 12:45 ` [PR PATCH] [Merged]: " leahneukirchen
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2022-08-19 16:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1016 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.5.
<!-- 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.~

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: 4278 bytes --]

From 0a188dfe5ada0074bd279815c3138404bbef46b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 19 Aug 2022 15:53:24 +0100
Subject: [PATCH 1/2] rocksdb: update to 7.4.5.

---
 common/shlibs                           |  2 +-
 srcpkgs/rocksdb/patches/toku_time.patch | 17 +++++++++++++++++
 srcpkgs/rocksdb/template                | 22 ++++++----------------
 3 files changed, 24 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/rocksdb/patches/toku_time.patch

diff --git a/common/shlibs b/common/shlibs
index 2e5258f3a243..180804f9f62f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3619,7 +3619,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.5_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/rocksdb/patches/toku_time.patch b/srcpkgs/rocksdb/patches/toku_time.patch
new file mode 100644
index 000000000000..9ffe1390ed1d
--- /dev/null
+++ b/srcpkgs/rocksdb/patches/toku_time.patch
@@ -0,0 +1,17 @@
+From: https://github.com/facebook/rocksdb/issues/8609
+
+diff --git a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
+index 225e3fa72..cd5f935f1 100644
+--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
++++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
+@@ -131,6 +131,10 @@ static inline tokutime_t toku_time_now(void) {
+   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();
+ #elif defined(__s390x__)
diff --git a/srcpkgs/rocksdb/template b/srcpkgs/rocksdb/template
index 2ae7db40ab91..e2ef6f916c06 100644
--- a/srcpkgs/rocksdb/template
+++ b/srcpkgs/rocksdb/template
@@ -1,31 +1,21 @@
 # Template file for 'rocksdb'
 pkgname=rocksdb
-version=5.18.3
-revision=2
+version=7.4.5
+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"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=7fb6738263d3f2b360d7468cf2ebe333f3109f3ba1ff80115abd145d75287254
-CFLAGS=-DNDEBUG
-CXXFLAGS=-DNDEBUG
+checksum=af237cbdde7b7b7a0ee8a5858e9d49ed71964801cf768052ce0cdfd302943cc2
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
-# Use the C++17 feature to align new
-CXXFLAGS="-faligned-new -Wno-error=deprecated-copy -Wno-error=pessimizing-move"
-
-pre_configure() {
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		vsed -i CMakeLists.txt \
-			-e 's;target_link_libraries(${ROCKSDB_SHARED_LIB};& atomic;'
-	fi
-}
 
 post_install() {
 	vcopy "include/rocksdb/*" usr/include/rocksdb

From a71309b246f759a7fd9e975afed5a4d71743f48d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 19 Aug 2022 16:26:00 +0100
Subject: [PATCH 2/2] neomutt: rebuild for rocksdb7.4.5

---
 srcpkgs/neomutt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Merged]: rocksdb: update to 7.4.5.
  2022-07-24 15:03 [PR PATCH] Rocksdb 7.4.3 motorto
                   ` (10 preceding siblings ...)
  2022-08-19 16:09 ` [PR PATCH] [Updated] rocksdb: update to 7.4.5 motorto
@ 2022-08-21 12:45 ` leahneukirchen
  11 siblings, 0 replies; 13+ messages in thread
From: leahneukirchen @ 2022-08-21 12:45 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

rocksdb: update to 7.4.5.
https://github.com/void-linux/void-packages/pull/38245

Description:
<!-- 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.~

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2022-08-21 12:45 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-24 15:03 [PR PATCH] Rocksdb 7.4.3 motorto
2022-07-24 15:27 ` [PR PATCH] [Updated] rocksdb: update to 7.4.3 motorto
2022-07-24 16:01 ` motorto
2022-07-24 17:02 ` motorto
2022-07-25 11:44 ` motorto
2022-07-25 11:46 ` motorto
2022-07-25 11:54 ` motorto
2022-08-19 14:54 ` [PR PATCH] [Updated] " motorto
2022-08-19 14:54 ` motorto
2022-08-19 14:55 ` [PR PATCH] [Updated] " motorto
2022-08-19 15:26 ` motorto
2022-08-19 16:09 ` [PR PATCH] [Updated] rocksdb: update to 7.4.5 motorto
2022-08-21 12:45 ` [PR PATCH] [Merged]: " leahneukirchen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).