Gentoo Archives: gentoo-commits

From: Bernard Cafarelli <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/, games-emulation/dosbox-staging/files/
Date: Sat, 15 Jan 2022 10:01:34
Message-Id: 1642240884.0784ac677157c9940fe45091321c9939a9daa559.voyageur@gentoo
1 commit: 0784ac677157c9940fe45091321c9939a9daa559
2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 15 09:59:46 2022 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 15 10:01:24 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0784ac67
7
8 games-emulation/dosbox-staging: fix compilation with musl
9
10 Closes: https://bugs.gentoo.org/830930
11 Package-Manager: Portage-3.0.30, Repoman-3.0.3
12 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
13
14 .../dosbox-staging/dosbox-staging-0.78.1.ebuild | 2 ++
15 .../files/dosbox-staging-0.78.1-musl.patch | 16 ++++++++++++++++
16 2 files changed, 18 insertions(+)
17
18 diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild
19 index 462a9abd8870..a882bcb7b4a8 100644
20 --- a/games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild
21 +++ b/games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild
22 @@ -35,6 +35,8 @@ BDEPEND="test? ( dev-cpp/gtest )"
23
24 DOCS=( AUTHORS README THANKS )
25
26 +PATCHES=( "${FILESDIR}"/${P}-musl.patch )
27 +
28 src_prepare() {
29 default
30
31
32 diff --git a/games-emulation/dosbox-staging/files/dosbox-staging-0.78.1-musl.patch b/games-emulation/dosbox-staging/files/dosbox-staging-0.78.1-musl.patch
33 new file mode 100644
34 index 000000000000..a1f4fe3ca654
35 --- /dev/null
36 +++ b/games-emulation/dosbox-staging/files/dosbox-staging-0.78.1-musl.patch
37 @@ -0,0 +1,16 @@
38 +diff --git a/src/libs/loguru/loguru.cpp b/src/libs/loguru/loguru.cpp
39 +index 9675cc1d..c4b5c0e3 100644
40 +--- a/src/libs/loguru/loguru.cpp
41 ++++ b/src/libs/loguru/loguru.cpp
42 +@@ -83,7 +83,7 @@
43 + #ifndef LOGURU_STACKTRACES
44 + #define LOGURU_STACKTRACES 0
45 + #endif
46 +-#elif defined(__rtems__) || defined(__ANDROID__) || defined(__FreeBSD__)
47 ++#elif defined(__rtems__) || defined(__ANDROID__) || defined(__FreeBSD__) || !defined(__GLIBC__)
48 + #define LOGURU_PTHREADS 1
49 + #define LOGURU_WINTHREADS 0
50 + #ifndef LOGURU_STACKTRACES
51 +--
52 +2.34.1
53 +