| 1 |
commit: 0ef031f6fe3e7439b9b50048c530819966aa49b2 |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 2 02:32:17 2021 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 2 02:34:33 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ef031f6 |
| 7 |
|
| 8 |
dev-libs/rocksdb: keyword 6.14.6-r1 for ~riscv |
| 9 |
|
| 10 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 11 |
|
| 12 |
.../rocksdb/files/rocksdb-6.14.6-libatomic.patch | 29 ++++++++++++++++++++++ |
| 13 |
dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild | 6 ++++- |
| 14 |
2 files changed, 34 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch b/dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..5ffcc8eee9f |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch |
| 21 |
@@ -0,0 +1,29 @@ |
| 22 |
+--- a/CMakeLists.txt |
| 23 |
++++ b/CMakeLists.txt |
| 24 |
+@@ -325,6 +325,26 @@ |
| 25 |
+ add_definitions(-DROCKSDB_SUPPORT_THREAD_LOCAL) |
| 26 |
+ endif() |
| 27 |
+ |
| 28 |
++set(ATOMIC_TEST_SOURCE " |
| 29 |
++#include <atomic> |
| 30 |
++int main() { |
| 31 |
++ std::atomic<bool> y (false); |
| 32 |
++ std::atomic<uint64_t> x (0); |
| 33 |
++ bool expected = true; |
| 34 |
++ bool j = y.compare_exchange_weak(expected,false); |
| 35 |
++ x++; |
| 36 |
++ return 0; |
| 37 |
++}") |
| 38 |
++CHECK_CXX_SOURCE_COMPILES("${ATOMIC_TEST_SOURCE}" ATOMICS_ARE_BUILTIN) |
| 39 |
++if (NOT ATOMICS_ARE_BUILTIN) |
| 40 |
++ set(CMAKE_REQUIRED_LIBRARIES atomic) |
| 41 |
++ check_cxx_source_compiles("${ATOMIC_TEST_SOURCE}" ATOMICS_REQUIRE_LIBATOMIC) |
| 42 |
++ unset(CMAKE_REQUIRED_LIBRARIES) |
| 43 |
++ if (ATOMICS_REQUIRE_LIBATOMIC) |
| 44 |
++ string(APPEND CMAKE_CXX_STANDARD_LIBRARIES " -latomic") |
| 45 |
++ endif () |
| 46 |
++endif () |
| 47 |
++ |
| 48 |
+ option(FAIL_ON_WARNINGS "Treat compile warnings as errors" ON) |
| 49 |
+ if(FAIL_ON_WARNINGS) |
| 50 |
+ if(MSVC) |
| 51 |
|
| 52 |
diff --git a/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild b/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild |
| 53 |
index 52fa5972a51..337b328a43c 100644 |
| 54 |
--- a/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild |
| 55 |
+++ b/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild |
| 56 |
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 57 |
|
| 58 |
LICENSE="GPL-2" |
| 59 |
SLOT="0" |
| 60 |
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" |
| 61 |
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" |
| 62 |
IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs" |
| 63 |
|
| 64 |
DEPEND=" |
| 65 |
@@ -25,6 +25,10 @@ DEPEND=" |
| 66 |
" |
| 67 |
RDEPEND="${DEPEND}" |
| 68 |
|
| 69 |
+PATCHES=( |
| 70 |
+ "${FILESDIR}"/${PN}-6.14.6-libatomic.patch |
| 71 |
+) |
| 72 |
+ |
| 73 |
src_configure() { |
| 74 |
mycmakeargs=( |
| 75 |
-DFAIL_ON_WARNINGS=OFF |
Archives