From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2153B15810F for ; Sat, 3 Jun 2023 01:54:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2AF30E089C; Sat, 3 Jun 2023 01:54:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0AE6FE089C for ; Sat, 3 Jun 2023 01:54:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0FB6534100A for ; Sat, 3 Jun 2023 01:54:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 48763A71 for ; Sat, 3 Jun 2023 01:54:44 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1685757275.37730ad6c0384670c28db327239bcf6be3480b03.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/, sys-cluster/ceph/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/ceph/ceph-17.2.6-r3.ebuild sys-cluster/ceph/files/ceph-17.2.6-arrow-flatbuffers-c++14.patch X-VCS-Directories: sys-cluster/ceph/files/ sys-cluster/ceph/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 37730ad6c0384670c28db327239bcf6be3480b03 X-VCS-Branch: master Date: Sat, 3 Jun 2023 01:54:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1a904d98-2a32-466b-bc65-dca3dac1068f X-Archives-Hash: 9dbc79c12c8448ebe6d8c90cf2b7f14c commit: 37730ad6c0384670c28db327239bcf6be3480b03 Author: Sam James gentoo org> AuthorDate: Sat Jun 3 01:54:01 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jun 3 01:54:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37730ad6 sys-cluster/ceph: fix build w/ new abseil Closes: https://bugs.gentoo.org/895254 Signed-off-by: Sam James gentoo.org> sys-cluster/ceph/ceph-17.2.6-r3.ebuild | 2 + .../ceph-17.2.6-arrow-flatbuffers-c++14.patch | 92 ++++++++++++++++++++++ 2 files changed, 94 insertions(+) diff --git a/sys-cluster/ceph/ceph-17.2.6-r3.ebuild b/sys-cluster/ceph/ceph-17.2.6-r3.ebuild index c1d16e9edab6..259638cf91a1 100644 --- a/sys-cluster/ceph/ceph-17.2.6-r3.ebuild +++ b/sys-cluster/ceph/ceph-17.2.6-r3.ebuild @@ -225,6 +225,8 @@ PATCHES=( "${FILESDIR}/ceph-17.2.5-boost-1.81.patch" # https://bugs.gentoo.org/901403 "${FILESDIR}/ceph-17.2.6-link-boost-context.patch" + # https://bugs.gentoo.org/905626 + "${FILESDIR}/ceph-17.2.6-arrow-flatbuffers-c++14.patch" ) check-reqs_export_vars() { diff --git a/sys-cluster/ceph/files/ceph-17.2.6-arrow-flatbuffers-c++14.patch b/sys-cluster/ceph/files/ceph-17.2.6-arrow-flatbuffers-c++14.patch new file mode 100644 index 000000000000..e5ab9943a4f6 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-17.2.6-arrow-flatbuffers-c++14.patch @@ -0,0 +1,92 @@ +https://bugs.gentoo.org/905626 +https://github.com/google/flatbuffers/pull/7897 +https://github.com/apache/arrow/commit/22dc537e581b385b53ce579a03786a2db0bd4487 + +From 22dc537e581b385b53ce579a03786a2db0bd4487 Mon Sep 17 00:00:00 2001 +From: Antoine Pitrou +Date: Thu, 20 Jan 2022 20:44:40 +0100 +Subject: [PATCH] ARROW-15388: [C++] Avoid including absl from flatbuffers + +There may be an incomplete/broken copy of the Abseil library lying around +(for example because of a race condition while installing it as a bundled library). + +Since absl is only used by Flatbuffers to provide a string_view facility, +use our own vendored string_view instead. + +Closes #12204 from pitrou/ARROW-15388-flatbuffers-string-view + +Authored-by: Antoine Pitrou +Signed-off-by: Antoine Pitrou +--- + cpp/thirdparty/flatbuffers/README.md | 42 +++++++++++++++++++ + .../flatbuffers/include/flatbuffers/base.h | 7 ---- + 2 files changed, 42 insertions(+), 7 deletions(-) + create mode 100644 cpp/thirdparty/flatbuffers/README.md + +diff --git a/src/arrow/cpp/thirdparty/flatbuffers/README.md b/src/arrow/cpp/thirdparty/flatbuffers/README.md +new file mode 100644 +index 0000000000000..e955adba4cebb +--- /dev/null ++++ b/src/arrow/cpp/thirdparty/flatbuffers/README.md +@@ -0,0 +1,42 @@ ++ ++ ++This directory contains a vendored version of Flatbuffers ++(unknown changeset), with the following patch for ARROW-15388: ++ ++```diff ++diff --git a/cpp/thirdparty/flatbuffers/include/flatbuffers/base.h b/cpp/thirdparty/flatbuffers/include/flatbuffers/base.h ++index 955738067..fccce42f6 100644 ++--- a/cpp/thirdparty/flatbuffers/include/flatbuffers/base.h +++++ b/cpp/thirdparty/flatbuffers/include/flatbuffers/base.h ++@@ -212,13 +212,6 @@ namespace flatbuffers { ++ typedef std::experimental::string_view string_view; ++ } ++ #define FLATBUFFERS_HAS_STRING_VIEW 1 ++- // Check for absl::string_view ++- #elif __has_include("absl/strings/string_view.h") ++- #include "absl/strings/string_view.h" ++- namespace flatbuffers { ++- typedef absl::string_view string_view; ++- } ++- #define FLATBUFFERS_HAS_STRING_VIEW 1 ++ #endif ++ #endif // __has_include ++ #endif // !FLATBUFFERS_HAS_STRING_VIEW ++``` +diff --git a/src/arrow/cpp/thirdparty/flatbuffers/include/flatbuffers/base.h b/src/arrow/cpp/thirdparty/flatbuffers/include/flatbuffers/base.h +index 9557380672342..fccce42f68aa6 100644 +--- a/src/arrow/cpp/thirdparty/flatbuffers/include/flatbuffers/base.h ++++ b/src/arrow/cpp/thirdparty/flatbuffers/include/flatbuffers/base.h +@@ -212,13 +212,6 @@ namespace flatbuffers { + typedef std::experimental::string_view string_view; + } + #define FLATBUFFERS_HAS_STRING_VIEW 1 +- // Check for absl::string_view +- #elif __has_include("absl/strings/string_view.h") +- #include "absl/strings/string_view.h" +- namespace flatbuffers { +- typedef absl::string_view string_view; +- } +- #define FLATBUFFERS_HAS_STRING_VIEW 1 + #endif + #endif // __has_include + #endif // !FLATBUFFERS_HAS_STRING_VIEW +