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 6B68D158099 for ; Mon, 20 Nov 2023 10:06:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7724E2BC02D; Mon, 20 Nov 2023 10:06:43 +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 59E812BC02D for ; Mon, 20 Nov 2023 10:06:43 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6F71E335D21 for ; Mon, 20 Nov 2023 10:06:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 93B1313A9 for ; Mon, 20 Nov 2023 10:06:39 +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: <1700474632.ab3288fee25a9c80d6a25ceb79e564c85ad1cb1e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/, dev-cpp/abseil-cpp/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-sdata-tests.patch X-VCS-Directories: dev-cpp/abseil-cpp/files/ dev-cpp/abseil-cpp/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ab3288fee25a9c80d6a25ceb79e564c85ad1cb1e X-VCS-Branch: master Date: Mon, 20 Nov 2023 10:06:39 +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: 6a91382f-b5f0-47ae-88eb-8b5b5b7985fb X-Archives-Hash: 9d75e2526963d1d4f79326a752700f88 commit: ab3288fee25a9c80d6a25ceb79e564c85ad1cb1e Author: Matoro Mahri matoro tk> AuthorDate: Sun Nov 19 04:44:05 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Nov 20 10:03:52 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab3288fe dev-cpp/abseil-cpp: add patch for test on .sdata platforms See: https://github.com/matoro/abseil-cpp/commit/cc37c61553fa2a186d4abf48e97ad9df4e5d62e3 Bug: https://bugs.gentoo.org/917062 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Sam James gentoo.org> dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild | 1 + .../files/abseil-cpp-20230802.0-sdata-tests.patch | 41 ++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild index bf2a6afad44c..614d40121204 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild @@ -28,6 +28,7 @@ BDEPEND=" " RESTRICT="!test? ( test )" +PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" ) src_prepare() { cmake_src_prepare diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-sdata-tests.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-sdata-tests.patch new file mode 100644 index 000000000000..67d3a9697731 --- /dev/null +++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-sdata-tests.patch @@ -0,0 +1,41 @@ +https://bugs.gentoo.org/show_bug.cgi?id=917062 +https://github.com/matoro/abseil-cpp/commit/cc37c61553fa2a186d4abf48e97ad9df4e5d62e3 + +From cc37c61553fa2a186d4abf48e97ad9df4e5d62e3 Mon Sep 17 00:00:00 2001 +From: matoro +Date: Tue, 14 Nov 2023 10:39:34 -0500 +Subject: [PATCH] symbolize_test: account for platforms with ".sdata" small + data sections + +A handful of ELF targets use a ".sdata" section for small data. The +default maximum size of symbols in this section as well as the gcc flag +to change that maximum size differ between two targets. On such +platforms, if there is no data large enough to exceed the small data +limit then the ".data" section will be excluded entirely. This changes +the check to ensure that at least one of a ".sdata" section OR a ".data" +section is present. +--- + absl/debugging/symbolize_test.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/absl/debugging/symbolize_test.cc b/absl/debugging/symbolize_test.cc +index d0feab2ffa6..1e4b5ba6105 100644 +--- a/absl/debugging/symbolize_test.cc ++++ b/absl/debugging/symbolize_test.cc +@@ -44,6 +44,7 @@ + #define MAP_ANONYMOUS MAP_ANON + #endif + ++using testing::AnyOf; + using testing::Contains; + + #ifdef _WIN32 +@@ -456,7 +457,7 @@ TEST(Symbolize, ForEachSection) { + EXPECT_THAT(sections, Contains(".rodata")); + EXPECT_THAT(sections, Contains(".bss")); + ++in_data_section; +- EXPECT_THAT(sections, Contains(".data")); ++ EXPECT_THAT(sections, AnyOf(Contains(".data"), Contains(".sdata"))); + + close(fd); + }