summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2022-09-19 08:51:43 +0200
committerConrad Kostecki <conikost@gentoo.org>2022-10-02 16:41:54 +0200
commite45b940271ed2733bdc49327204ac148a968413d (patch)
tree82bcdac4f437e407b36f2243c4f82dc473c73baa /dev-cpp/folly
parentnet-p2p/rtorrent: remove unused files (diff)
downloadgentoo-e45b940271ed2733bdc49327204ac148a968413d.tar.gz
gentoo-e45b940271ed2733bdc49327204ac148a968413d.tar.bz2
gentoo-e45b940271ed2733bdc49327204ac148a968413d.zip
dev-cpp/folly: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Portage 3.0.35 / pkgdev 0.2.1 / pkgcheck 0.10.14 Closes: https://github.com/gentoo/gentoo/pull/27347 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'dev-cpp/folly')
-rw-r--r--dev-cpp/folly/files/folly-2022.08.08.00-undefined-reference-fix.patch62
-rw-r--r--dev-cpp/folly/files/folly-2022.08.15.00-liburing-headers.patch102
2 files changed, 0 insertions, 164 deletions
diff --git a/dev-cpp/folly/files/folly-2022.08.08.00-undefined-reference-fix.patch b/dev-cpp/folly/files/folly-2022.08.08.00-undefined-reference-fix.patch
deleted file mode 100644
index 1a21386b1e83..000000000000
--- a/dev-cpp/folly/files/folly-2022.08.08.00-undefined-reference-fix.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://github.com/facebook/folly/commit/10fc2e449038d9ffda5cd53999edb9875c4cb151
-
-From 10fc2e449038d9ffda5cd53999edb9875c4cb151 Mon Sep 17 00:00:00 2001
-From: Simon Marlow <smarlow@fb.com>
-Date: Fri, 12 Aug 2022 08:26:40 -0700
-Subject: [PATCH] Fix bugs in Cmake setup
-
-Summary:
-Please see https://github.com/facebook/folly/issues/1823 and
-https://github.com/facebook/folly/issues/1478
-
-* CMAKE_LIBRARY_ARCHITECTURE is not always defined
-* This doesn't work: `set(IS_X86_64_ARCH NOT(IS_X86_64_ARCH STREQUAL "-1"))`
-* Two conditionals for `IS_X86_64_ARCH` were reversed
-
-Reviewed By: bochko
-
-Differential Revision: D38653631
-
-fbshipit-source-id: c4b6f2820a2280356a7eb69bf0e9253434b5e750
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,8 +27,19 @@ if(POLICY CMP0075)
- cmake_policy(SET CMP0075 NEW)
- endif()
-
--string(FIND "${CMAKE_LIBRARY_ARCHITECTURE}" "x86_64" IS_X86_64_ARCH)
--set(IS_X86_64_ARCH NOT(IS_X86_64_ARCH STREQUAL "-1"))
-+if("${CMAKE_LIBRARY_ARCHITECTURE}" STREQUAL "")
-+ # CMAKE_LIBRARY_ARCHITECTURE is not always set, so we have to assume
-+ # arch might be x86_64
-+ message(WARNING "CMAKE_LIBRARY_ARCHITECTURE not set, assuming x86_64")
-+ set(IS_X86_64_ARCH ON)
-+else()
-+ string(FIND "${CMAKE_LIBRARY_ARCHITECTURE}" "x86_64" IS_X86_64_ARCH)
-+ if(IS_X86_64_ARCH STREQUAL "-1")
-+ set(IS_X86_64_ARCH OFF)
-+ else()
-+ set(IS_X86_64_ARCH ON)
-+ endif()
-+endif()
-
- # includes
- set(CMAKE_MODULE_PATH
-@@ -230,7 +241,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
- endif()
-
- # base64 SIMD files compilation
--if (${IS_X86_64_ARCH})
-+if (NOT(${IS_X86_64_ARCH}))
- message(
- STATUS
- "arch ${CMAKE_LIBRARY_ARCHITECTURE} does not match x86_64, "
-@@ -256,7 +267,7 @@ else()
- endif()
-
- if (${LIBSODIUM_FOUND})
-- if (${IS_X86_64_ARCH})
-+ if (NOT(${IS_X86_64_ARCH}))
- message(
- STATUS
- "arch ${CMAKE_LIBRARY_ARCHITECTURE} does not match x86_64, "
diff --git a/dev-cpp/folly/files/folly-2022.08.15.00-liburing-headers.patch b/dev-cpp/folly/files/folly-2022.08.15.00-liburing-headers.patch
deleted file mode 100644
index f485ee2175fc..000000000000
--- a/dev-cpp/folly/files/folly-2022.08.15.00-liburing-headers.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-Fix build w/ older kernel headers.
-
-https://github.com/facebook/folly/commit/ae20efa9fa8cea81079df519d93dcbd1523c8dc3
-
-From ae20efa9fa8cea81079df519d93dcbd1523c8dc3 Mon Sep 17 00:00:00 2001
-From: Dylan Yudaken <dylany@fb.com>
-Date: Mon, 15 Aug 2022 08:32:53 -0700
-Subject: [PATCH] io_uring: support older versions of liburing
-
-Summary: Some #if to support older versions of liburing as reported here; https://github.com/facebook/folly/issues/1832
-
-Reviewed By: Orvid
-
-Differential Revision: D38650359
-
-fbshipit-source-id: eb78a7607eaaf151dc394cef72df3826c83fdfbc
---- a/folly/experimental/io/IoUringBackend.cpp
-+++ b/folly/experimental/io/IoUringBackend.cpp
-@@ -40,6 +40,16 @@ extern "C" FOLLY_ATTR_WEAK void eb_poll_loop_pre_hook(uint64_t* call_time);
- extern "C" FOLLY_ATTR_WEAK void eb_poll_loop_post_hook(
- uint64_t call_time, int ret);
-
-+// there is no builtin macro we can use in liburing to tell what version we are
-+// on or if features are supported. We will try and get this into the next
-+// release but for now in the latest release there was also added multishot
-+// accept - and so we can use it's pressence to suggest that we can safely use
-+// newer features
-+#if defined(IORING_ACCEPT_MULTISHOT)
-+#define FOLLY_IO_URING_UP_TO_DATE 1
-+#else
-+#define FOLLY_IO_URING_UP_TO_DATE 0
-+#endif
- namespace folly {
-
- namespace {
-@@ -296,11 +306,7 @@ std::chrono::time_point<std::chrono::steady_clock> getTimerExpireTime(
- return now + us;
- }
-
--// there is no builtin macro we can use in liburing to tell if buffer rings are
--// supported. However in the release that added them, there was also added
--// multishot accept - and so we can use it's pressence to suggest that we can
--// safely use provided buffer rings
--#if defined(IORING_ACCEPT_MULTISHOT)
-+#if FOLLY_IO_URING_UP_TO_DATE
-
- class ProvidedBuffersBuffer {
- public:
-@@ -738,7 +744,11 @@ IoUringBackend::IoUringBackend(Options options)
- params_.flags |= IORING_SETUP_CQSIZE;
- params_.cq_entries = options.capacity;
- if (options_.taskRunCoop) {
-+#if FOLLY_IO_URING_UP_TO_DATE
- params_.flags |= IORING_SETUP_COOP_TASKRUN;
-+#else
-+ // this has no functional change so just leave it
-+#endif
- }
-
- // poll SQ options
-@@ -1237,9 +1247,12 @@ int IoUringBackend::eb_event_base_loop(int flags) {
- }
-
- if (options_.registerRingFd) {
-+ // registering just has some perf impact, so no need to fall back
-+#if FOLLY_IO_URING_UP_TO_DATE
- if (io_uring_register_ring_fd(&ioRing_) < 0) {
- LOG(ERROR) << "unable to register io_uring ring fd";
- }
-+#endif
- }
- }
-
-@@ -1496,9 +1509,11 @@ void IoUringBackend::cancel(IoSqeBase* ioSqe) {
- auto* sqe = get_sqe();
- io_uring_prep_cancel64(sqe, (uint64_t)ioSqe, 0);
- io_uring_sqe_set_data(sqe, (void*)&ioSqeNop); // just need something unique
-+#if FOLLY_IO_URING_UP_TO_DATE
- if (params_.features & IORING_FEAT_CQE_SKIP) {
- sqe->flags |= IOSQE_CQE_SKIP_SUCCESS;
- }
-+#endif
- }
-
- int IoUringBackend::cancelOne(IoSqe* ioSqe) {
-@@ -1848,9 +1863,15 @@ void IoUringBackend::processFileOp(IoSqe* sqe, int64_t res) noexcept {
- }
-
- bool IoUringBackend::kernelHasNonBlockWriteFixes() const {
-+#if FOLLY_IO_URING_UP_TO_DATE
- // this was fixed in 5.18, which introduced linked file
- // fixed in "io_uring: only wake when the correct events are set"
- return params_.features & IORING_FEAT_LINKED_FILE;
-+#else
-+ // this indicates that sockets have to manually remove O_NONBLOCK
-+ // which is a bit slower but shouldnt cause any functional changes
-+ return false;
-+#endif
- }
-
- namespace {
-