Date: Sun, 3 Nov 2024 20:53:38 GMT From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: efc339d7d341 - main - devel/folly: remove libc++ 19 workaround Message-ID: <202411032053.4A3Krc7s057983@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=efc339d7d34167976859cfcb2791abec5756dffa commit efc339d7d34167976859cfcb2791abec5756dffa Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2024-11-03 16:18:52 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2024-11-03 20:53:19 +0000 devel/folly: remove libc++ 19 workaround For bug 281499 we added a workaround for the `peekView()` method returning a `std::basic_string<uint8_t>`, which is no longer supported in libc++ 19 and later. However, upstream folly has consolidated the `peek` and `peekView` methods into just `peek`, and is now returning a `std::span<uint8_t const>` instead [1], so the workaround is no longer needed. Remove it, and bump PORTREVISION so dependent ports get rebuilt. In particular, I was looking at a build failure of net/mvfst which was occurring in the folly headers, due to the `peek()` method being unavailable. [1] https://github.com/facebook/folly/commit/3f21ed6dd97f36ca6653b16d5b086b8b8a7efebc PR: 282522 Approved by: yuri (maintainer) MFH: 2024Q4 --- devel/folly/Makefile | 1 + devel/folly/files/patch-folly_io_Cursor.h | 18 ------------------ 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/devel/folly/Makefile b/devel/folly/Makefile index 71018bf5c15d..14fb4781a48a 100644 --- a/devel/folly/Makefile +++ b/devel/folly/Makefile @@ -1,6 +1,7 @@ PORTNAME= folly DISTVERSIONPREFIX= v DISTVERSION= 2024.10.28.00 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org diff --git a/devel/folly/files/patch-folly_io_Cursor.h b/devel/folly/files/patch-folly_io_Cursor.h deleted file mode 100644 index f79053c883bc..000000000000 --- a/devel/folly/files/patch-folly_io_Cursor.h +++ /dev/null @@ -1,18 +0,0 @@ ---- folly/io/Cursor.h.orig 2024-09-07 03:24:18 UTC -+++ folly/io/Cursor.h -@@ -677,6 +677,7 @@ class CursorBase { - return ByteRange{data(), available}; - } - -+#if !defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 190000 - /** - * Alternate version of peekBytes() that returns a std::basic_string_view - * instead of a ByteRage. -@@ -687,6 +688,7 @@ class CursorBase { - auto bytes = peekBytes(); - return {bytes.data(), bytes.size()}; - } -+#endif // _LIBCPP_VERSION < 190000 - - /** - * Alternate version of peekBytes() that returns a std::pair
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411032053.4A3Krc7s057983>