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 <heire...@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
+}

Reply via email to