From 0530006d7f63d6c158b4ff5ea0c3f7ef3bae9cc4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 23 Feb 2023 21:45:48 +0000 Subject: gentoo auto-resync : 23:02:2023 - 21:45:48 --- dev-cpp/Manifest.gz | Bin 12919 -> 12915 bytes dev-cpp/folly/Manifest | 2 - .../folly/files/folly-2023.01.16.00-gcc13.patch | 24 --------- .../folly/files/folly-2023.01.16.00-liburing.patch | 54 --------------------- 4 files changed, 80 deletions(-) delete mode 100644 dev-cpp/folly/files/folly-2023.01.16.00-gcc13.patch delete mode 100644 dev-cpp/folly/files/folly-2023.01.16.00-liburing.patch (limited to 'dev-cpp') diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz index f97ee939b358..a38610c48e52 100644 Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest index cf75ec6d03ce..8b95054192e7 100644 --- a/dev-cpp/folly/Manifest +++ b/dev-cpp/folly/Manifest @@ -1,6 +1,4 @@ AUX folly-2022.07.04.00-musl-fix.patch 1150 BLAKE2B 6774badf3856fa94ae69dc4ca3fb3aca628dcf3b96fd7d141967815a9a07c07349f852a35275baba7b91d60e0c61dc3e1639cab4727666fa128d0334f36815a2 SHA512 15029e25b4da1f9cfe227978a54f63c198361df665b4657ef6a80ffdd3911c80be8e6c3799c8c16ff0fcca050932155628651a6e5ed566a41174dced9e51dc58 -AUX folly-2023.01.16.00-gcc13.patch 672 BLAKE2B a6f69671bc279f69837e5c0fa5f252f242e63ae8079ddff59077b09d550946def8eba866d059a218955dd9940cb40f6cdcda6be6b4eab0f8159de98cfa774c61 SHA512 e3a79ee2d972b6b4491309f7982f1a6a85921993a70a1881d5f0d1ab6a3384fc0f543f77f57591265dce0561b98946fd81ca382e1e01e8d19765112ef3b74605 -AUX folly-2023.01.16.00-liburing.patch 2064 BLAKE2B 353a6985b1a7a237b9600227f0da479cd3bcbc240f80314adb8b1068bde75e74cc1120ddd1c4cc808d782cc18edbc9da6bf86d83c562a947588d3f1164f9ef38 SHA512 9dd91a39b670811391476dc4258ad566804d65242c437348596a7788a8daab523157c2f3ed46050eb295305845f8ad396cdb5a3152c13abebb44db012c8874fd DIST folly-v2022.08.29.00.tar.gz 3696645 BLAKE2B c1ff618be8b6a73bf0a1249212cf904ac472711086e54da73dd631ecf002761e30496e8631d6591f51e279b736ae9b3fe50959de6b1f86f01f9d6bc08fe675fc SHA512 1437a1314e26624715a0bb781049e19300eb3a67648287b319c55ce0dfbc867a09bd9d2f0cece6fc75fc62b21899aa94b464ae49c12687be7c94fdf0c7b95790 DIST folly-v2023.02.06.00.tar.gz 3790845 BLAKE2B b1c0eed7a2dccba3ccb5e25aa24cc0a6d628fbc3134bf0ed82a1e0e614825a3ae620d79a54e2bea398274afcb662bdfca48d7193f69db35f624ed6a2fa9bae99 SHA512 b9cd8132a702e88e4c9fefcce190d9fd403253c9b71dc22316f237922d99f9cd980ab81d50ddb48ae0e614a493b3d61865b03eee46d59805f83fce528f831646 EBUILD folly-2022.08.29.00.ebuild 2474 BLAKE2B ba8b143ee679b37e2facd8ac30f6eee6ca8fd2606c5731757f2a2b5d6f6a9ce655d97f97317c907c5452e0e6494e81ee1dee376d97c708cc950b9e1e6090853d SHA512 81b7baddf458a0d394e158671f71f613fc7b760aea065b5ce7ab26856bdae9303462ac770b6dd067bf49f63fc776fdae4a66c9437cd9de009a2e716969e044f1 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 -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 etc is no longer transitively included. - -Signed-off-by: Sam James ---- a/folly/system/AtFork.cpp -+++ b/folly/system/AtFork.cpp -@@ -14,6 +14,9 @@ - * limitations under the License. - */ - -+#include -+#include -+ - #include - - #include - 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 -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); - } - -- cgit v1.2.3