public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/, dev-cpp/abseil-cpp/files/
Date: Mon, 20 Nov 2023 10:06:39 +0000 (UTC)	[thread overview]
Message-ID: <1700474632.ab3288fee25a9c80d6a25ceb79e564c85ad1cb1e.sam@gentoo> (raw)

commit:     ab3288fee25a9c80d6a25ceb79e564c85ad1cb1e
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Sun Nov 19 04:44:05 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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_gentoo <AT> matoro.tk>
Signed-off-by: Sam James <sam <AT> 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 <matoro@users.noreply.github.com>
+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);
+ }


             reply	other threads:[~2023-11-20 10:06 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-20 10:06 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-04  2:32 [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/, dev-cpp/abseil-cpp/files/ Yixun Lan
2024-07-07  0:26 Sam James
2022-08-23  7:30 WANG Xuerui
2022-06-26  2:45 Jason Zaman
2021-12-26  7:21 Georgy Yakovlev
2021-11-16 11:58 Sam James
2021-06-17 17:51 Georgy Yakovlev
2021-04-29  4:05 Sam James
2021-04-22  4:07 Georgy Yakovlev
2021-04-04 21:59 Georgy Yakovlev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1700474632.ab3288fee25a9c80d6a25ceb79e564c85ad1cb1e.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox