From fbda87924e6faa7a1919f1a2b4182490bde5ec5c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 3 Sep 2021 20:56:28 +0100 Subject: gentoo resync : 03.09.2021 --- dev-libs/rocksdb/Manifest | 7 +- .../rocksdb/files/rocksdb-6.14.6-libatomic.patch | 105 +++++++++++++++++++++ dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild | 6 +- dev-libs/rocksdb/rocksdb-6.15.5.ebuild | 4 + dev-libs/rocksdb/rocksdb-6.17.3.ebuild | 4 + 5 files changed, 122 insertions(+), 4 deletions(-) create mode 100644 dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch (limited to 'dev-libs/rocksdb') diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest index 78f332c33805..44614dd6f64f 100644 --- a/dev-libs/rocksdb/Manifest +++ b/dev-libs/rocksdb/Manifest @@ -1,7 +1,8 @@ +AUX rocksdb-6.14.6-libatomic.patch 2994 BLAKE2B cac08dfa6fd490645e341148701ba0372aa97f76c84010e3ed94e3aa3a501762c7b2ea09cccc9e895912204e79d7430694b5ab7302fccb7b25f1c7f2ebba4afc SHA512 9f3814133699d7069ebff35b0513ad113a744d7adf21d7ec1d7975fc4fbd114430618760fd38dea69c6948dbf1dc4f5a994f7b347b40423c0244d2867276e448 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 -EBUILD rocksdb-6.14.6-r1.ebuild 1096 BLAKE2B 627a65313bfc642f1fa77f3cc0e20324d7b62b17e9464d9436285b4ebee5d3d932183ef521f43aa545f5ef5bc3b727bd520b373348672025005af75e29c294d3 SHA512 7a43c3752950b3d884c537f3378a823747f366e2ec896478f7a40ae002083cbd8a540e0189f28ba788f1a3cd471014ce579740b4744e2c4039911548fd0f3d3a -EBUILD rocksdb-6.15.5.ebuild 1095 BLAKE2B d674b9cb7dc1f515a26a8ed904df6bcd562790064c11360bb433782a9972a4826897ba9976a8244ebca498daa882e70ed2cca1738502159b5d5898acfcfd758c SHA512 b6bf539eeb0f902239d9897d216cb60583a4921e68b710aa1e6a87d9c5726b10bff4113a1671c71487ea4b01ed1f439ff712e6f3073d5b9148f97a252d0974f8 -EBUILD rocksdb-6.17.3.ebuild 1102 BLAKE2B 2ba5047f5b99765d8d1e0d9abb85741ca337fdadef66ed99397b3b69ef960da1ab1732c6ff5a00f9353895c29197b291823559943785a897e7f7db28d7e386da SHA512 7543d6a5b04cac6b7ea523538126f19293744f919d83d6e56a6d416580c86cc250bb23b5df7d513e24c7fee020e3aba78c8b4d1e5ad5bfdf6314b36799419d81 +EBUILD rocksdb-6.14.6-r1.ebuild 1160 BLAKE2B 5009cd00349faa37165a5367a5ff79200b8c20422e6de77658f72da663478b283d8b084f7d7f76c23f83a7b22ff2b7b42d536858adb45742395a90cdc924ad19 SHA512 a8b462f530fa1b158722977ded10f60426b09d8fd538f2d1511dcb781abddd198de7e0f83f88a097f2f6b13da65f999685e54e745c8f06a95f6d19115a61e70d +EBUILD rocksdb-6.15.5.ebuild 1152 BLAKE2B 1f8cfcf17f8b74bf9e6eb8fdeed62cf75b59a807f4f153ab715bc46084f313271fa7199e1fa2eb8f09b5e77b712a5f7a6baaca120efbc64bac723d42fe14692f SHA512 f7a0c6457c609e0c2341e389fce1124e2ba64107f620c04506ddf39901135561cd3af9ce48211fc5f5816985d273d578bb93ce1aad0ee7c02b4590bb1cd7fa7d +EBUILD rocksdb-6.17.3.ebuild 1159 BLAKE2B d8409769d990b81de0cc17fbf7c0f0dde178c6894af6b2a076bacdce813a3996236818ac3832883e7ba75022bad89ad105edc635bf225da5faa96ea84af8102a SHA512 39bd04fab4b745e1f656e9fa0b027e40690510e0378b3b26d4b96956db0257ef2d7042f24059a92ba31eb312774b290ad7483be79ff5fce32d59f86bd2e8dcda MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0 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 000000000000..27f17aab8933 --- /dev/null +++ b/dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch @@ -0,0 +1,105 @@ +From 38d79de10da65d234c70cbb36c24c58d189f76db Mon Sep 17 00:00:00 2001 +From: mrambacher +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 +@@ -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() + ++# Check if -latomic is required or not ++if (NOT MSVC) ++ set(CMAKE_REQUIRED_FLAGS "--std=c++11") ++ CHECK_CXX_SOURCE_COMPILES(" ++#include ++std::atomic x(0); ++int main() { ++ uint64_t i = x.load(std::memory_order_relaxed); ++ bool b = x.is_lock_free(); ++ return 0; ++} ++" BUILTIN_ATOMIC) ++if (NOT BUILTIN_ATOMIC) ++ #TODO: Check if -latomic exists ++ list(APPEND THIRDPARTY_LIBS atomic) ++endif() ++endif() ++ ++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 +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 +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.14.6-r1.ebuild b/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild index 52fa5972a51b..337b328a43cf 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 diff --git a/dev-libs/rocksdb/rocksdb-6.15.5.ebuild b/dev-libs/rocksdb/rocksdb-6.15.5.ebuild index eca7931e3752..c8bb53cec446 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 e441ef854c8d..76c4d651f8af 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 -- cgit v1.2.3