commit: 83dad47cef23dc9a25a36feafc923887056239b5 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Nov 28 21:35:32 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Dec 28 15:24:22 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83dad47c
dev-libs/rocksdb: drop 6.14.6-r2, 6.14.6-r3, 7.9.2 Closes: https://bugs.gentoo.org/892275 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-libs/rocksdb/Manifest | 1 - dev-libs/rocksdb/files/rocksdb-6.14.6-gcc13.patch | 51 -------------- .../rocksdb/files/rocksdb-6.17.3-libatomic.patch | 71 ------------------- dev-libs/rocksdb/rocksdb-6.14.6-r2.ebuild | 52 -------------- dev-libs/rocksdb/rocksdb-6.14.6-r3.ebuild | 79 ---------------------- dev-libs/rocksdb/rocksdb-7.9.2.ebuild | 55 --------------- 6 files changed, 309 deletions(-) diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest index 223ab14c10c6..39aa040bf25b 100644 --- a/dev-libs/rocksdb/Manifest +++ b/dev-libs/rocksdb/Manifest @@ -1,4 +1,3 @@ -DIST rocksdb-6.14.6.tar.gz 6397194 BLAKE2B 43ad8e7e9fdf0c6c75ff03370f2107899bbcef9fd34630c85408abcf208a8213f5e24ea50407bd6a719220b6c29b9ba29c121e94a5a2701f637b17ccf50b90a4 SHA512 609f407b0b2810954541ad8ebad5c754ebfde5021f24ee4b3f1544a5335252c06cbe2b282562e3d084bb9cbe8de239668fdedb2d2d726056c31cf9463db08fe7 DIST rocksdb-7.9.2.tar.gz 12058713 BLAKE2B 76a840565fccdc800eaad055da7698f7a5fc6e217187e078d60420c61cde1236c427cc4ae7d557c69ee5c358cd1ebc7fc4ed52063c04965fcc2c3c35774e9f59 SHA512 9cf2a359cedb21ca70fc921e54f19c406fd9aa2a739ad1627842fad2dec0e7dedbfe52aa8e85fbfbe7005c00ca1e7e7013f728d4d9938f3cebdf794504b431cb DIST rocksdb-8.11.3.tar.gz 13345436 BLAKE2B 8d8069c030ee345090ebec15528342d776d7a74d6b72808a054511aad169acaa89c5fee530e73b3faba9152aadc4d26f1edc4586e31ddf5501d2899b5d6500ec SHA512 df701e8f3a94efe351c5dfec691635b6cff9b5902e8d5bd714caa7389bbbfd8ce7f7e91f1549978b47b934449fb3b77581dfcc2811a7727be049709a330ca71e DIST rocksdb-9.7.4.tar.gz 13615065 BLAKE2B 8babae4a879d3d08c7bccf0b93dc78bf413d3d518b9470e343588cba92f796ad5d493128276fe0673e915bfd8eab8a98abfd52dd0e633446324989db00032746 SHA512 d7209fee27f0b40ebce7a43c0356b2e6ca355d768d60b5e56599074bbd2aa555f4ed3b97e85ef492742be1597184d505b6acfd84ad27d6a5b83bf1a13bf4b1ca diff --git a/dev-libs/rocksdb/files/rocksdb-6.14.6-gcc13.patch b/dev-libs/rocksdb/files/rocksdb-6.14.6-gcc13.patch deleted file mode 100644 index 384c241bc2b8..000000000000 --- a/dev-libs/rocksdb/files/rocksdb-6.14.6-gcc13.patch +++ /dev/null @@ -1,51 +0,0 @@ -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/files/rocksdb-6.17.3-libatomic.patch b/dev-libs/rocksdb/files/rocksdb-6.17.3-libatomic.patch deleted file mode 100644 index 56cc674d09a4..000000000000 --- a/dev-libs/rocksdb/files/rocksdb-6.17.3-libatomic.patch +++ /dev/null @@ -1,71 +0,0 @@ -Fixes check for atomics. - -The upstream currently does not have checks for atomics in v6.17.3. -However, since v6.22.1, rocksdb includes checks similar/identical to -files/rocksdb-6.14.6-libatomic.patch, which is superseded by this new patch. -See: https://github.com/facebook/rocksdb/commit/47b424f4bd51078591e674ff936de5a270530ce2 -Once the upstream adopts new methods for checking, this patch may be removed after testing. - -https://bugs.gentoo.org/834855 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -289,6 +289,7 @@ else() - endif() - - include(CheckCXXSourceCompiles) -+set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) - if(NOT MSVC) - set(CMAKE_REQUIRED_FLAGS "-msse4.2 -mpclmul") - endif() -@@ -305,7 +306,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) -@@ -313,6 +313,37 @@ elseif(FORCE_SSE42) - message(FATAL_ERROR "FORCE_SSE42=ON but unable to compile with SSE4.2 enabled") - endif() - -+# Check if -latomic is required or not -+if (NOT MSVC) -+ set(CMAKE_REQUIRED_FLAGS "--std=c++11") -+ set(ATOMIC_TEST_SOURCE " -+ #include <atomic> -+ std::atomic<int> x; -+ std::atomic<short> y; -+ std::atomic<char> z; -+ std::atomic<long long> w; -+ int main() { -+ ++z; -+ ++y; -+ ++w; -+ return ++x; -+ }") -+ CHECK_CXX_SOURCE_COMPILES("${ATOMIC_TEST_SOURCE}" BUILTIN_ATOMIC) -+ if (NOT BUILTIN_ATOMIC) -+ set(CMAKE_REQUIRED_LIBRARIES atomic) -+ CHECK_CXX_SOURCE_COMPILES("${ATOMIC_TEST_SOURCE}" ATOMICS_REQUIRE_LIBATOMIC) -+ unset(CMAKE_REQUIRED_LIBRARIES) -+ if (ATOMICS_REQUIRE_LIBATOMIC) -+ list(APPEND THIRDPARTY_LIBS atomic) -+ else() -+ message(FATAL_ERROR "Host compiler must support std::atomic!") -+ endif() -+ endif() -+endif() -+ -+# Reset the required flags -+set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS}) -+ - CHECK_CXX_SOURCE_COMPILES(" - #if defined(_MSC_VER) && !defined(__thread) - #define __thread __declspec(thread) -@@ -1354,3 +1385,4 @@ option(WITH_EXAMPLES "build with examples" OFF) - if(WITH_EXAMPLES) - add_subdirectory(examples) - endif() -+ diff --git a/dev-libs/rocksdb/rocksdb-6.14.6-r2.ebuild b/dev-libs/rocksdb/rocksdb-6.14.6-r2.ebuild deleted file mode 100644 index d7ebe58e23d4..000000000000 --- a/dev-libs/rocksdb/rocksdb-6.14.6-r2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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/zlib:= - jemalloc? ( dev-libs/jemalloc:= ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-6.17.3-libatomic.patch - "${FILESDIR}"/${PN}-6.14.6-gcc13.patch -) - -src_configure() { - 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) - -DWITH_TESTS=OFF - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - if ! use static-libs; then - rm "${ED}"/usr/$(get_libdir)/*.a || die - fi -} diff --git a/dev-libs/rocksdb/rocksdb-6.14.6-r3.ebuild b/dev-libs/rocksdb/rocksdb-6.14.6-r3.ebuild deleted file mode 100644 index c82e4963034e..000000000000 --- a/dev-libs/rocksdb/rocksdb-6.14.6-r3.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 2020-2024 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 numa static-libs tbb test" - -# tests fail in this version -RESTRICT="test" - -DEPEND=" - app-arch/bzip2:= - app-arch/lz4:= - app-arch/snappy:= - app-arch/zstd:= - dev-cpp/gflags:= - sys-libs/zlib:= - sys-process/numactl - jemalloc? ( dev-libs/jemalloc:= ) - tbb? ( dev-cpp/tbb:= ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-6.17.3-libatomic.patch - "${FILESDIR}"/${PN}-6.14.6-gcc13.patch -) - -src_prepare() { - sed -i -e '/find_program(CCACHE_FOUND ccache)/d' CMakeLists.txt || die - cmake_src_prepare -} - -src_configure() { - 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_BZ2=ON - -DWITH_CORE_TOOLS=ON - -DWITH_DYNAMIC_EXTENSION=ON - -DWITH_GFLAGS=ON - -DWITH_JEMALLOC=$(usex jemalloc ON OFF) - -DWITH_JNI=OFF - -DWITH_LIBRADOS=OFF - -DWITH_LZ4=ON - -DWITH_MD_LIBRARY=ON - -DWITH_NUMA=$(usex numa) - -DWITH_SNAPPY=ON - -DWITH_TBB=$(usex tbb) - -DWITH_ALL_TESTS=$(usex test) - -DWITH_TESTS=$(usex test) - -DWITH_TOOLS=ON - -DWITH_ZLIB=ON - -DWITH_ZSTD=ON - ) - # -DWITH_TESTS option works only with debug build, needs to be set here - # to not be overriden by cmake.eclass - CMAKE_BUILD_TYPE=$(usex test Debug RelWithDebInfo) cmake_src_configure -} - -src_install() { - cmake_src_install - - if ! use static-libs; then - rm "${ED}"/usr/$(get_libdir)/*.a || die - fi -} diff --git a/dev-libs/rocksdb/rocksdb-7.9.2.ebuild b/dev-libs/rocksdb/rocksdb-7.9.2.ebuild deleted file mode 100644 index 1a2347e5d00e..000000000000 --- a/dev-libs/rocksdb/rocksdb-7.9.2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# 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 -}
