From nobody Sun Nov 3 20:53:38 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XhRdv07hhz5cpBS; Sun, 03 Nov 2024 20:53:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhRdt5FCVz57Pq; Sun, 3 Nov 2024 20:53:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730667218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fogmeFE/kE/k8FQZL4wjADunsbm9Gx07r/1iNO+u1E4=; b=tBQ+VkAshdbTvXCVcCHtBKX4Yq119EuKiBc+BaBr440+FIdoZz9LkPSEqI3eLtp43vTeyl vPQbhK9qe3Y/b1ETtBnFLo0IDiavuqgbicvwZc3bwfbylCyLFUTVXIiWqLfE1KLr9zSUh6 C0Yk84QAXXzmlUfon7cbu5KAYBNQ0YsDMPEu8OtQLJjpxVoxlJ+U+m2qt2b8T0GSTh0esA Z7baCP/7M8YHUAlDKPm5l0Fr1Cwamis4P1kyyX5alCs3rGnQcDdrD7wYFU1wcv5ixDhij/ e9f9awhrWFQvYkzqzLqQIf6iwjpG6LvY4ltesl8oPzaIe7N05gblDZaVLbY2oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730667218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fogmeFE/kE/k8FQZL4wjADunsbm9Gx07r/1iNO+u1E4=; b=aYkHZLtmzmRyKZDmOw3De7byTkVBpdlU+8ricPKcjZuGGxdCXeZjQMTEe92UhNtyQX6wRo pIRapL7c7V0YLYFflqsaaNBFtGtaF58DyTm6rXzX2x9WoIgv8ajuLSu76PulEM3aCSAeEX lSyjPtcSDb3SUDQUVfYebUngCeLwE6EZcm3ynBN1HIz2IIZzWXjrkNUAM+gByVipwIruES pR8eekM9bfLAko3g5E9XxY105NmUu3WhwwspJU1Yw3sJnI4M3ve/8qhYs4xePQYmVdt6VC lANMJXurFl2SwISOkF2o5BznoyQEzkzFf448DZeHGW5gvkcu3DcWipOeTNQdNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730667218; a=rsa-sha256; cv=none; b=d1GMmlhvgdoXW6MlmqUnxEfRpIbR+I/InKlvvYX4Zk8LGIiF/L5ygh2UTAazqscN/1cLfW u17cVXhkgJg4+XvwXrMDmpucOhNR3Tt2ggTnr4itBQ+KJ9KDi3FLLtBN9zPOumEP4nGc4n A/GIQuckUvpafH8ChlijGj6pAxds5y/5UNaKhv707Ee77TFLcQfyn6LctJjie5aK3JKTSL GsM2WwIfLTw8AJb6wVt4U/w814czIlOhqrixMhGt60G46Kxb4QlSi6ns9dOrRD8CBVmUWP Au5PXTPAGBi5uKHjnQ7kB1bSsC+/TRfis0L+s1EDRYZ+apk8JLo1rZ6992ZYIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XhRdt4sXgz14W1; Sun, 3 Nov 2024 20:53:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A3Krcv6057986; Sun, 3 Nov 2024 20:53:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A3Krc7s057983; Sun, 3 Nov 2024 20:53:38 GMT (envelope-from git) Date: Sun, 3 Nov 2024 20:53:38 GMT Message-Id: <202411032053.4A3Krc7s057983@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: efc339d7d341 - main - devel/folly: remove libc++ 19 workaround List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efc339d7d34167976859cfcb2791abec5756dffa Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=efc339d7d34167976859cfcb2791abec5756dffa commit efc339d7d34167976859cfcb2791abec5756dffa Author: Dimitry Andric AuthorDate: 2024-11-03 16:18:52 +0000 Commit: Dimitry Andric 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`, 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` 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