public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocksdb/files/, dev-libs/rocksdb/
@ 2023-04-18 10:24 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-04-18 10:24 UTC (permalink / raw
  To: gentoo-commits

commit:     f389a74eff56c8d514be52b0e4346d2c0decc44f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 18 10:24:18 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 10:24:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f389a74e

dev-libs/rocksdb: fix build w/ gcc 13

Closes: https://bugs.gentoo.org/895358
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/rocksdb/files/rocksdb-6.14.6-gcc13.patch | 51 +++++++++++++++++++++++
 dev-libs/rocksdb/rocksdb-6.15.5-r1.ebuild         |  1 +
 dev-libs/rocksdb/rocksdb-6.17.3-r1.ebuild         |  1 +
 3 files changed, 53 insertions(+)

diff --git a/dev-libs/rocksdb/files/rocksdb-6.14.6-gcc13.patch b/dev-libs/rocksdb/files/rocksdb-6.14.6-gcc13.patch
new file mode 100644
index 000000000000..384c241bc2b8
--- /dev/null
+++ b/dev-libs/rocksdb/files/rocksdb-6.14.6-gcc13.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/895358
+--- a/db/compaction/compaction_iteration_stats.h
++++ b/db/compaction/compaction_iteration_stats.h
+@@ -5,6 +5,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include "rocksdb/rocksdb_namespace.h"
+ 
+ struct CompactionIterationStats {
+--- a/include/rocksdb/utilities/checkpoint.h
++++ b/include/rocksdb/utilities/checkpoint.h
+@@ -8,6 +8,7 @@
+ #pragma once
+ #ifndef ROCKSDB_LITE
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ #include "rocksdb/status.h"
+--- a/table/block_based/data_block_hash_index.h
++++ b/table/block_based/data_block_hash_index.h
+@@ -5,6 +5,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+--- a/third-party/folly/folly/synchronization/detail/ProxyLockable-inl.h
++++ b/third-party/folly/folly/synchronization/detail/ProxyLockable-inl.h
+@@ -13,6 +13,7 @@
+ #include <memory>
+ #include <mutex>
+ #include <stdexcept>
++#include <system_error>
+ #include <utility>
+ 
+ namespace folly {
+--- a/util/string_util.h
++++ b/util/string_util.h
+@@ -6,6 +6,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <sstream>
+ #include <string>
+ #include <unordered_map>

diff --git a/dev-libs/rocksdb/rocksdb-6.15.5-r1.ebuild b/dev-libs/rocksdb/rocksdb-6.15.5-r1.ebuild
index e5d045110946..65bcab9dd9d0 100644
--- a/dev-libs/rocksdb/rocksdb-6.15.5-r1.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.15.5-r1.ebuild
@@ -26,6 +26,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-6.14.6-gcc13.patch
 	"${FILESDIR}"/${PN}-6.17.3-libatomic.patch
 )
 

diff --git a/dev-libs/rocksdb/rocksdb-6.17.3-r1.ebuild b/dev-libs/rocksdb/rocksdb-6.17.3-r1.ebuild
index 06b33de81b92..86a2c6f594ad 100644
--- a/dev-libs/rocksdb/rocksdb-6.17.3-r1.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.17.3-r1.ebuild
@@ -26,6 +26,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-6.14.6-gcc13.patch
 	"${FILESDIR}"/${PN}-6.17.3-add_timer_for_riscv.patch
 	"${FILESDIR}"/${PN}-6.17.3-libatomic.patch
 )


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocksdb/files/, dev-libs/rocksdb/
@ 2023-01-27  5:26 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-01-27  5:26 UTC (permalink / raw
  To: gentoo-commits

commit:     f7e3d7d5818dad3db8d12a8a6c70c7f2140c994a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 05:06:48 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 05:23:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e3d7d5

dev-libs/rocksdb: add 7.9.2

Closes: https://bugs.gentoo.org/774897
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/rocksdb/Manifest                         |  1 +
 dev-libs/rocksdb/files/rocksdb-7.9.2-gcc-13.patch | 42 +++++++++++++++++
 dev-libs/rocksdb/rocksdb-7.9.2.ebuild             | 55 +++++++++++++++++++++++
 3 files changed, 98 insertions(+)

diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest
index b684fdd63187..90462c51e272 100644
--- a/dev-libs/rocksdb/Manifest
+++ b/dev-libs/rocksdb/Manifest
@@ -1,3 +1,4 @@
 DIST rocksdb-6.14.6.tar.gz 6397194 BLAKE2B 43ad8e7e9fdf0c6c75ff03370f2107899bbcef9fd34630c85408abcf208a8213f5e24ea50407bd6a719220b6c29b9ba29c121e94a5a2701f637b17ccf50b90a4 SHA512 609f407b0b2810954541ad8ebad5c754ebfde5021f24ee4b3f1544a5335252c06cbe2b282562e3d084bb9cbe8de239668fdedb2d2d726056c31cf9463db08fe7
 DIST rocksdb-6.15.5.tar.gz 6501252 BLAKE2B f85c6b54043019692a7174e41b69625650d072ee4de1f2850628854af4b5672ff7072ab5c41de84bca9ad0713a1eea7ad7c5cca5ba9b3b96c4bd492a01b5e859 SHA512 c0918fd48bc1e57be9e30452c5cd0c2ba627a15012ab6922404d6cddffdf80799e4442b14d03cbe13a9a9acbdf1736c505cc6f5406efefbf68aba71ec05cf5f0
 DIST rocksdb-6.17.3.tar.gz 6651009 BLAKE2B c032bdf61d93a35e84c65146ad6d1f8639e9f36a323c142fe4131b501051bfb9c4c4edb13b69c86e35740117029996bb4c94887ea690d1957926bdfd347c744a SHA512 085adab94b7eb22859b4119b0356f148231800413571e932a7248967b1866d40a0be4b8265f2a9c6c21c600d3b2254c36e64ce7851171ff7c439a17306a84981
+DIST rocksdb-7.9.2.tar.gz 12058713 BLAKE2B 76a840565fccdc800eaad055da7698f7a5fc6e217187e078d60420c61cde1236c427cc4ae7d557c69ee5c358cd1ebc7fc4ed52063c04965fcc2c3c35774e9f59 SHA512 9cf2a359cedb21ca70fc921e54f19c406fd9aa2a739ad1627842fad2dec0e7dedbfe52aa8e85fbfbe7005c00ca1e7e7013f728d4d9938f3cebdf794504b431cb

diff --git a/dev-libs/rocksdb/files/rocksdb-7.9.2-gcc-13.patch b/dev-libs/rocksdb/files/rocksdb-7.9.2-gcc-13.patch
new file mode 100644
index 000000000000..513d0da01c29
--- /dev/null
+++ b/dev-libs/rocksdb/files/rocksdb-7.9.2-gcc-13.patch
@@ -0,0 +1,42 @@
+https://github.com/facebook/rocksdb/commit/88edfbfb5e1cac228f7cc31fbec24bb637fe54b1
+
+From 88edfbfb5e1cac228f7cc31fbec24bb637fe54b1 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Wed, 25 Jan 2023 14:30:32 -0800
+Subject: [PATCH] Fix build with gcc 13 by including <cstdint> (#11118)
+
+Summary:
+Like other versions before, gcc 13 moved some includes around and as a result <cstdint> is no longer transitively included [1]. Explicitly include it for uint{32,64}_t.
+
+[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+
+Pull Request resolved: https://github.com/facebook/rocksdb/pull/11118
+
+Reviewed By: cbi42
+
+Differential Revision: D42711356
+
+Pulled By: ajkr
+
+fbshipit-source-id: 5ea257b85b7017f40fd8fdbce965336da95c55b2
+--- a/table/block_based/data_block_hash_index.h
++++ b/table/block_based/data_block_hash_index.h
+@@ -5,6 +5,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+--- a/util/string_util.h
++++ b/util/string_util.h
+@@ -6,6 +6,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <sstream>
+ #include <string>
+ #include <unordered_map>
+

diff --git a/dev-libs/rocksdb/rocksdb-7.9.2.ebuild b/dev-libs/rocksdb/rocksdb-7.9.2.ebuild
new file mode 100644
index 000000000000..f28536667a0f
--- /dev/null
+++ b/dev-libs/rocksdb/rocksdb-7.9.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Embeddable, persistent key-value store for fast storage"
+HOMEPAGE="http://rocksdb.org https://github.com/facebook/rocksdb/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs"
+
+DEPEND="
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	app-arch/snappy:=
+	app-arch/zstd:=
+	dev-cpp/gflags:=
+	sys-libs/liburing:=
+	sys-libs/zlib:=
+	jemalloc? ( dev-libs/jemalloc:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-13.patch
+)
+
+src_configure() {
+	sed -i -e '/find_program(CCACHE_FOUND ccache)/d' CMakeLists.txt || die
+
+	local mycmakeargs=(
+		-DFAIL_ON_WARNINGS=OFF
+		-DFORCE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+		-DFORCE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DFORCE_SSE42=$(usex cpu_flags_x86_sse4_2 ON OFF)
+		-DPORTABLE=ON
+		-DWITH_JEMALLOC=$(usex jemalloc ON OFF)
+		# They're just examples/benchmarks.
+		-DWITH_TESTS=OFF
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/*.a || die
+	fi
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocksdb/files/, dev-libs/rocksdb/
@ 2021-09-02 10:51 Marek Szuba
  0 siblings, 0 replies; 4+ messages in thread
From: Marek Szuba @ 2021-09-02 10:51 UTC (permalink / raw
  To: gentoo-commits

commit:     9a5672672cbda260a4fb713a266f50f4724f23df
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  2 10:46:37 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Sep  2 10:50:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a567267

dev-libs/rocksdb: apply upstream libatomic check

Will have already been included in 6.20.2+.

Closes: https://bugs.gentoo.org/809830
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../rocksdb/files/rocksdb-6.14.6-libatomic.patch   | 118 +++++++++++++++++----
 dev-libs/rocksdb/rocksdb-6.15.5.ebuild             |   4 +
 dev-libs/rocksdb/rocksdb-6.17.3.ebuild             |   4 +
 3 files changed, 105 insertions(+), 21 deletions(-)

diff --git a/dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch b/dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch
index 5ffcc8eee9f..27f17aab893 100644
--- a/dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch
+++ b/dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch
@@ -1,29 +1,105 @@
+From 38d79de10da65d234c70cbb36c24c58d189f76db Mon Sep 17 00:00:00 2001
+From: mrambacher <mrambach@gmail.com>
+Date: Mon, 12 Apr 2021 20:06:57 -0400
+Subject: [PATCH 1/3] Add check to cmake to see if we need to link against
+ -latomic
+
+For some compilers/environments (e.g. Clang, riscv64), we need to link against -latomic.  Check if this is a requirement and add the library to the third-party libs if it is.
+---
+ CMakeLists.txt | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 984c6197cb..460d350054 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -325,6 +325,26 @@
-   add_definitions(-DROCKSDB_SUPPORT_THREAD_LOCAL)
+@@ -312,7 +312,6 @@ int main() {
+   auto d = _mm_cvtsi128_si64(c);
+ }
+ " HAVE_SSE42)
+-unset(CMAKE_REQUIRED_FLAGS)
+ if(HAVE_SSE42)
+   add_definitions(-DHAVE_SSE42)
+   add_definitions(-DHAVE_PCLMUL)
+@@ -320,6 +319,26 @@ elseif(FORCE_SSE42)
+   message(FATAL_ERROR "FORCE_SSE42=ON but unable to compile with SSE4.2 enabled")
  endif()
  
-+set(ATOMIC_TEST_SOURCE "
++# Check if -latomic is required or not
++if (NOT MSVC)
++  set(CMAKE_REQUIRED_FLAGS "--std=c++11")
++  CHECK_CXX_SOURCE_COMPILES("
 +#include <atomic>
++std::atomic<uint64_t> x(0);
 +int main() {
-+  std::atomic<bool> y (false);
-+  std::atomic<uint64_t> x (0);
-+  bool expected = true;
-+  bool j = y.compare_exchange_weak(expected,false);
-+  x++;
++  uint64_t i = x.load(std::memory_order_relaxed);
++  bool b = x.is_lock_free();
 +  return 0;
-+}")
-+CHECK_CXX_SOURCE_COMPILES("${ATOMIC_TEST_SOURCE}" ATOMICS_ARE_BUILTIN)
-+if (NOT ATOMICS_ARE_BUILTIN)
-+  set(CMAKE_REQUIRED_LIBRARIES atomic)
-+  check_cxx_source_compiles("${ATOMIC_TEST_SOURCE}" ATOMICS_REQUIRE_LIBATOMIC)
-+  unset(CMAKE_REQUIRED_LIBRARIES)
-+  if (ATOMICS_REQUIRE_LIBATOMIC)
-+    string(APPEND CMAKE_CXX_STANDARD_LIBRARIES " -latomic")
-+  endif ()
-+endif ()
++}
++" BUILTIN_ATOMIC)
++if (NOT BUILTIN_ATOMIC)
++  #TODO: Check if -latomic exists 
++  list(APPEND THIRDPARTY_LIBS atomic)
++endif()
++endif()
 +
- option(FAIL_ON_WARNINGS "Treat compile warnings as errors" ON)
- if(FAIL_ON_WARNINGS)
-   if(MSVC)
++unset(CMAKE_REQUIRED_FLAGS)
++
+ CHECK_CXX_SOURCE_COMPILES("
+ #if defined(_MSC_VER) && !defined(__thread)
+ #define __thread __declspec(thread)
+
+From df7fdd69ac19f26601a80e35f70ec51913838a6e Mon Sep 17 00:00:00 2001
+From: mrambacher <mrambach@gmail.com>
+Date: Wed, 14 Apr 2021 10:33:47 -0400
+Subject: [PATCH 2/3] Reset CMAKE_REQUIRED_FLAGS after compilation checks
+
+---
+ CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 460d350054..5d167855a7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -296,6 +296,7 @@ else()
+ endif()
+ 
+ include(CheckCXXSourceCompiles)
++set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
+ if(NOT MSVC)
+   set(CMAKE_REQUIRED_FLAGS "-msse4.2 -mpclmul")
+ endif()
+@@ -337,7 +338,8 @@ if (NOT BUILTIN_ATOMIC)
+ endif()
+ endif()
+ 
+-unset(CMAKE_REQUIRED_FLAGS)
++# Reset the required flags
++set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
+ 
+ CHECK_CXX_SOURCE_COMPILES("
+ #if defined(_MSC_VER) && !defined(__thread)
+
+From 4793c5c75351d5d7c609c27d0243c2138729c7b0 Mon Sep 17 00:00:00 2001
+From: mrambacher <mrambach@gmail.com>
+Date: Fri, 16 Apr 2021 08:53:48 -0400
+Subject: [PATCH 3/3] Fix lint warning
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5d167855a7..558b985073 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -333,7 +333,7 @@ int main() {
+ }
+ " BUILTIN_ATOMIC)
+ if (NOT BUILTIN_ATOMIC)
+-  #TODO: Check if -latomic exists 
++  #TODO: Check if -latomic exists
+   list(APPEND THIRDPARTY_LIBS atomic)
+ endif()
+ endif()

diff --git a/dev-libs/rocksdb/rocksdb-6.15.5.ebuild b/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
index eca7931e375..c8bb53cec44 100644
--- a/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
@@ -25,6 +25,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.14.6-libatomic.patch
+)
+
 src_configure() {
 	mycmakeargs=(
 		-DFAIL_ON_WARNINGS=OFF

diff --git a/dev-libs/rocksdb/rocksdb-6.17.3.ebuild b/dev-libs/rocksdb/rocksdb-6.17.3.ebuild
index e441ef854c8..76c4d651f8a 100644
--- a/dev-libs/rocksdb/rocksdb-6.17.3.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.17.3.ebuild
@@ -25,6 +25,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.14.6-libatomic.patch
+)
+
 src_configure() {
 	mycmakeargs=(
 		-DFAIL_ON_WARNINGS=OFF


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocksdb/files/, dev-libs/rocksdb/
@ 2021-09-02  2:34 Marek Szuba
  0 siblings, 0 replies; 4+ messages in thread
From: Marek Szuba @ 2021-09-02  2:34 UTC (permalink / raw
  To: gentoo-commits

commit:     0ef031f6fe3e7439b9b50048c530819966aa49b2
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  2 02:32:17 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Sep  2 02:34:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ef031f6

dev-libs/rocksdb: keyword 6.14.6-r1 for ~riscv

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../rocksdb/files/rocksdb-6.14.6-libatomic.patch   | 29 ++++++++++++++++++++++
 dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild          |  6 ++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch b/dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch
new file mode 100644
index 00000000000..5ffcc8eee9f
--- /dev/null
+++ b/dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch
@@ -0,0 +1,29 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -325,6 +325,26 @@
+   add_definitions(-DROCKSDB_SUPPORT_THREAD_LOCAL)
+ endif()
+ 
++set(ATOMIC_TEST_SOURCE "
++#include <atomic>
++int main() {
++  std::atomic<bool> y (false);
++  std::atomic<uint64_t> x (0);
++  bool expected = true;
++  bool j = y.compare_exchange_weak(expected,false);
++  x++;
++  return 0;
++}")
++CHECK_CXX_SOURCE_COMPILES("${ATOMIC_TEST_SOURCE}" ATOMICS_ARE_BUILTIN)
++if (NOT ATOMICS_ARE_BUILTIN)
++  set(CMAKE_REQUIRED_LIBRARIES atomic)
++  check_cxx_source_compiles("${ATOMIC_TEST_SOURCE}" ATOMICS_REQUIRE_LIBATOMIC)
++  unset(CMAKE_REQUIRED_LIBRARIES)
++  if (ATOMICS_REQUIRE_LIBATOMIC)
++    string(APPEND CMAKE_CXX_STANDARD_LIBRARIES " -latomic")
++  endif ()
++endif ()
++
+ option(FAIL_ON_WARNINGS "Treat compile warnings as errors" ON)
+ if(FAIL_ON_WARNINGS)
+   if(MSVC)

diff --git a/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild b/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
index 52fa5972a51..337b328a43c 100644
--- a/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs"
 
 DEPEND="
@@ -25,6 +25,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.14.6-libatomic.patch
+)
+
 src_configure() {
 	mycmakeargs=(
 		-DFAIL_ON_WARNINGS=OFF


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

end of thread, other threads:[~2023-04-18 10:24 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-18 10:24 [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocksdb/files/, dev-libs/rocksdb/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2023-01-27  5:26 Sam James
2021-09-02 10:51 Marek Szuba
2021-09-02  2:34 Marek Szuba

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox