commit:     eaab00c81c45e54fd2174fee1caa92b17c61c50a
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 14 17:53:53 2023 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 17:55:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaab00c8

games-roguelike/stone-soup: avoid execinfo.h on non-glibc

Upstream: https://github.com/crawl/crawl/issues/2446
Closes: https://bugs.gentoo.org/831632
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/files/avoid-musl-execinfo.patch   | 12 ++++++++++++
 games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild     |  1 +
 games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild       |  1 +
 games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild       |  1 +
 games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild       |  1 +
 games-roguelike/stone-soup/stone-soup-0.29.1.ebuild          |  1 +
 games-roguelike/stone-soup/stone-soup-0.30.1.ebuild          |  1 +
 .../stone-soup/stone-soup-0.31.0_pre20230712.ebuild          |  1 +
 8 files changed, 19 insertions(+)

diff --git a/games-roguelike/stone-soup/files/avoid-musl-execinfo.patch 
b/games-roguelike/stone-soup/files/avoid-musl-execinfo.patch
new file mode 100644
index 000000000000..923f940c3f57
--- /dev/null
+++ b/games-roguelike/stone-soup/files/avoid-musl-execinfo.patch
@@ -0,0 +1,12 @@
+--- a/crash.cc    2023-08-14 02:39:46.638062516 +0000
++++ b/crash.cc    2023-08-14 02:41:28.020698537 +0000
+@@ -27,7 +27,8 @@
+ #endif
+
+ #ifdef BACKTRACE_SUPPORTED
+-#if defined(TARGET_CPU_MIPS) || \
++#if !defined(__GLIBC__) || \
++    defined(TARGET_CPU_MIPS) || \
+     defined(TARGET_OS_FREEBSD) || \
+     defined(TARGET_OS_NETBSD) || \
+     defined(TARGET_OS_OPENBSD) || \

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild 
b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
index 150e83d6270e..cfb186245ce1 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
@@ -87,6 +87,7 @@ S=${WORKDIR}/${MY_P}/source
 PATCHES=(
        "${FILESDIR}"/make.patch
        "${FILESDIR}"/rltiles-make.patch
+       "${FILESDIR}"/avoid-musl-execinfo.patch
 )
 
 python_check_deps() {

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild 
b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
index 76214392d586..ac840b8128cf 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
@@ -87,6 +87,7 @@ S=${WORKDIR}/${MY_P}/source
 PATCHES=(
        "${FILESDIR}"/make.patch
        "${FILESDIR}"/rltiles-make.patch
+       "${FILESDIR}"/avoid-musl-execinfo.patch
 )
 
 python_check_deps() {

diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild 
b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
index 3f0437547cfa..c8dde8ecd912 100644
--- a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
@@ -87,6 +87,7 @@ S=${WORKDIR}/${MY_P}/source
 PATCHES=(
        "${FILESDIR}"/make.patch
        "${FILESDIR}"/rltiles-make.patch
+       "${FILESDIR}"/avoid-musl-execinfo.patch
 )
 
 python_check_deps() {

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild 
b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
index 64e098e751ce..1907acb253f4 100644
--- a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
@@ -101,6 +101,7 @@ BDEPEND="
 PATCHES=(
        "${FILESDIR}"/make.patch
        "${FILESDIR}"/rltiles-make.patch
+       "${FILESDIR}"/avoid-musl-execinfo.patch
 )
 
 python_check_deps() {

diff --git a/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild 
b/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
index 5ff221ce1c56..d751569f7cc8 100644
--- a/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
@@ -103,6 +103,7 @@ BDEPEND="
 PATCHES=(
        "${FILESDIR}"/make.patch
        "${FILESDIR}"/rltiles-make.patch
+       "${FILESDIR}"/avoid-musl-execinfo.patch
 )
 
 python_check_deps() {

diff --git a/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild 
b/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild
index cc9c0daa09b4..48d500eea5f4 100644
--- a/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild
@@ -103,6 +103,7 @@ BDEPEND="
 PATCHES=(
        "${FILESDIR}"/make-v3.patch
        "${FILESDIR}"/rltiles-make.patch
+       "${FILESDIR}"/avoid-musl-execinfo.patch
 )
 
 python_check_deps() {

diff --git a/games-roguelike/stone-soup/stone-soup-0.31.0_pre20230712.ebuild 
b/games-roguelike/stone-soup/stone-soup-0.31.0_pre20230712.ebuild
index b7a3296129e4..27d9fbf7f734 100644
--- a/games-roguelike/stone-soup/stone-soup-0.31.0_pre20230712.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.31.0_pre20230712.ebuild
@@ -103,6 +103,7 @@ BDEPEND="
 PATCHES=(
        "${FILESDIR}"/make-v3.patch
        "${FILESDIR}"/rltiles-make.patch
+       "${FILESDIR}"/avoid-musl-execinfo.patch
 )
 
 python_check_deps() {

Reply via email to