Attachment 254909 Details for Bug 282522 – devel/folly: remove libc++ 19 workaround

[patch] devel/folly: remove libc++ 19 workaround

devel__folly-remove-libcxx19-workaround-1.diff (text/plain), 2.01 KB, created by Dimitry Andric on 2024-11-03 16:19:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2024-11-03 16:19:50 UTC

Size: 2.01 KB

patch

obsolete

>commit a8eec74a9a3e8f1a319a03ffd2ac100c4fee02db
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   2024-11-03T17:18:52+01:00
>
>    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
>    MFH:            2024Q4
>
>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

Actions: View | Diff

Attachments on bug 282522: 254909