[gentoo-commits] repo/gentoo:master commit in: dev-cpp/folly/files/

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/folly/files/

[Conrad Kostecki]

commit:     e45b940271ed2733bdc49327204ac148a968413d
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Sep 19 06:51:43 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Oct  2 14:41:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e45b9402

dev-cpp/folly: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> 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 <AT> gentoo.org>

 ...lly-2022.08.08.00-undefined-reference-fix.patch |  62 -------------
 .../folly-2022.08.15.00-liburing-headers.patch     | 102 ---------------------
 2 files changed, 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 {
-

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/folly/files/

[Sam James]

commit:     53d9166b00b865e09ca09090e400985c2e3540a1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 05:07:29 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 05:07:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53d9166b

dev-cpp/folly: update patch to upstream variant

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../folly/files/folly-2023.01.16.00-gcc13.patch    | 27 +++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/dev-cpp/folly/files/folly-2023.01.16.00-gcc13.patch b/dev-cpp/folly/files/folly-2023.01.16.00-gcc13.patch
index 0fed0efeb505..6779274d2fa1 100644
--- a/dev-cpp/folly/files/folly-2023.01.16.00-gcc13.patch
+++ b/dev-cpp/folly/files/folly-2023.01.16.00-gcc13.patch
@@ -1,23 +1,24 @@
+https://github.com/facebook/folly/pull/1922
+
+From e3cba5dd4f59c695d9cbf6bd02249af7103cc300 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 22 Jan 2023 05:06:16 +0000
+Subject: [PATCH] Fix build with GCC 13 (add missing includes)
+
+GCC 13 (as usual for new compiler releases) shuffles around some
+internal includes and so <stdexcept> etc is no longer transitively included.
+
+Signed-off-by: Sam James <sam@gentoo.org>
 --- a/folly/system/AtFork.cpp
 +++ b/folly/system/AtFork.cpp
-@@ -14,6 +14,8 @@
+@@ -14,6 +14,9 @@
   * limitations under the License.
   */
  
 +#include <stdexcept>
++#include <system_error>
 +
  #include <folly/system/AtFork.h>
  
  #include <folly/ScopeGuard.h>
-diff --git a/folly/system/AtFork.cpp b/folly/system/AtFork.cpp
-index be613c7..a557033 100644
---- a/folly/system/AtFork.cpp
-+++ b/folly/system/AtFork.cpp
-@@ -15,6 +15,7 @@
-  */
- 
- #include <stdexcept>
-+#include <system_error>
- 
- #include <folly/system/AtFork.h>
- 
+

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/folly/files/

[Alfredo Tupone]

commit:     2ea7ea9cc6a5dd54120650b2fade2205f34c2d07
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Feb 22 16:39:54 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 20:46:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ea7ea9c

dev-cpp/folly: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29729
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 .../folly/files/folly-2023.01.16.00-gcc13.patch    | 24 ----------
 .../folly/files/folly-2023.01.16.00-liburing.patch | 54 ----------------------
 2 files changed, 78 deletions(-)

diff --git a/dev-cpp/folly/files/folly-2023.01.16.00-gcc13.patch b/dev-cpp/folly/files/folly-2023.01.16.00-gcc13.patch
deleted file mode 100644
index 6779274d2fa1..000000000000
--- a/dev-cpp/folly/files/folly-2023.01.16.00-gcc13.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/facebook/folly/pull/1922
-
-From e3cba5dd4f59c695d9cbf6bd02249af7103cc300 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 22 Jan 2023 05:06:16 +0000
-Subject: [PATCH] Fix build with GCC 13 (add missing includes)
-
-GCC 13 (as usual for new compiler releases) shuffles around some
-internal includes and so <stdexcept> etc is no longer transitively included.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/folly/system/AtFork.cpp
-+++ b/folly/system/AtFork.cpp
-@@ -14,6 +14,9 @@
-  * limitations under the License.
-  */
- 
-+#include <stdexcept>
-+#include <system_error>
-+
- #include <folly/system/AtFork.h>
- 
- #include <folly/ScopeGuard.h>
-

diff --git a/dev-cpp/folly/files/folly-2023.01.16.00-liburing.patch b/dev-cpp/folly/files/folly-2023.01.16.00-liburing.patch
deleted file mode 100644
index e2a692cea50c..000000000000
--- a/dev-cpp/folly/files/folly-2023.01.16.00-liburing.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/891633
-https://github.com/facebook/folly/issues/1908
-https://github.com/facebook/folly/commit/259c9d6a4f0eb6d80e0263c2fe5d1af5bff116dc
-
-From 259c9d6a4f0eb6d80e0263c2fe5d1af5bff116dc Mon Sep 17 00:00:00 2001
-From: Dylan Yudaken <dylany@meta.com>
-Date: Mon, 16 Jan 2023 01:20:04 -0800
-Subject: [PATCH] io_uring: implement io_uring_enable_rings locally (#1915)
-
-Summary:
-Pull Request resolved: https://github.com/facebook/folly/pull/1915
-
-io_uring_enable_rings was missing from liburing upstream (see https://github.com/axboe/liburing/issues/773) which is breaking the open source build. See https://github.com/facebook/folly/issues/1908
-
-Instead just implement it locally, as it's trivial
-
-Reviewed By: dmm-fb
-
-Differential Revision: D42497664
-
-fbshipit-source-id: 7241785a36046e867f907bfe74623aaeb38c4b70
---- a/folly/experimental/io/IoUringBackend.cpp
-+++ b/folly/experimental/io/IoUringBackend.cpp
-@@ -56,6 +56,20 @@ namespace folly {
- 
- namespace {
- 
-+#if FOLLY_IO_URING_UP_TO_DATE
-+int ioUringEnableRings(FOLLY_MAYBE_UNUSED struct io_uring* ring) {
-+  // Ideally this would call ::io_uring_enable_rings directly which just runs
-+  // the below however this was missing from a stable version of liburing, which
-+  // means that some distributions were not able to compile it. see
-+  // https://github.com/axboe/liburing/issues/773
-+
-+  // since it is so simple, just implement it here until the fix rolls out to an
-+  // acceptable number of OSS distributions.
-+  return ::io_uring_register(
-+      ring->ring_fd, IORING_REGISTER_ENABLE_RINGS, nullptr, 0);
-+}
-+#endif
-+
- struct SignalRegistry {
-   struct SigInfo {
-     struct sigaction sa_ {};
-@@ -1360,7 +1374,7 @@ void IoUringBackend::delayedInit() {
-   if (usingDeferTaskrun_) {
-     // usingDeferTaskrun_ is guarded already on having an up to date liburing
- #if FOLLY_IO_URING_UP_TO_DATE
--    int ret = ::io_uring_enable_rings(&ioRing_);
-+    int ret = ioUringEnableRings(&ioRing_);
-     if (ret) {
-       LOG(ERROR) << "io_uring_enable_rings gave " << folly::errnoStr(-ret);
-     }
-