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: games-strategy/augustus/, games-strategy/augustus/files/
Date: Mon, 18 Jul 2022 18:39:44 +0000 (UTC)	[thread overview]
Message-ID: <1658169576.3e173f2ec58049876cd16fe25714747932eed092.sam@gentoo> (raw)

commit:     3e173f2ec58049876cd16fe25714747932eed092
Author:     brahmajit das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Mon Jul 11 14:24:25 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 18:39:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e173f2e

games-strategy/augustus: Fix build on musl

musl doesn't provide execinfo.h, so include it only on glibc systems

Closes: https://bugs.gentoo.org/829345

Signed-off-by: brahmajit das <listout <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26348
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/augustus/augustus-3.1.0.ebuild                |  1 +
 .../augustus/files/augustus-3.1.0-musl-fix-execinfo.patch    | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/games-strategy/augustus/augustus-3.1.0.ebuild b/games-strategy/augustus/augustus-3.1.0.ebuild
index 1adb27ab8703..254e4efc5a77 100644
--- a/games-strategy/augustus/augustus-3.1.0.ebuild
+++ b/games-strategy/augustus/augustus-3.1.0.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.1-desktop_rename.patch"
+	"${FILESDIR}/${PN}-3.1.0-musl-fix-execinfo.patch"
 )
 
 src_prepare() {

diff --git a/games-strategy/augustus/files/augustus-3.1.0-musl-fix-execinfo.patch b/games-strategy/augustus/files/augustus-3.1.0-musl-fix-execinfo.patch
new file mode 100644
index 000000000000..97b96cf61e59
--- /dev/null
+++ b/games-strategy/augustus/files/augustus-3.1.0-musl-fix-execinfo.patch
@@ -0,0 +1,12 @@
+# Closes: https://bugs.gentoo.org/829345
+--- a/src/platform/crash_handler.c
++++ b/src/platform/crash_handler.c
+@@ -7,7 +7,7 @@
+
+ #if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && \
+     !defined(__vita__) && !defined(__SWITCH__) && !defined(__ANDROID__) && \
+-    !defined(__HAIKU__) && !defined(__EMSCRIPTEN__)
++    !defined(__HAIKU__) && !defined(__EMSCRIPTEN__) && defined(__GLIBC__)
+
+ #include <execinfo.h>
+ #include <signal.h>


             reply	other threads:[~2022-07-18 18:39 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-18 18:39 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-08-11  7:37 [gentoo-commits] repo/gentoo:master commit in: games-strategy/augustus/, games-strategy/augustus/files/ Ionen Wolkens

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=1658169576.3e173f2ec58049876cd16fe25714747932eed092.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