Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-engines/box2d/
Date: Mon, 11 Oct 2021 00:40:34
Message-Id: 1633912752.e27625bafd1ff9d1e04b6e8b308638723531ee4c.ionen@gentoo
1 commit: e27625bafd1ff9d1e04b6e8b308638723531ee4c
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 8 12:26:59 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 11 00:39:12 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e27625ba
7
8 games-engines/box2d: unbundle doctest to fix tests with glibc-2.34
9
10 Skipping leaving a bugref in the ebuild not to imply this should be
11 removed after it's fixed with glibc-2.34 (upstream has bumped
12 doctest in upcoming version, but may as well use system's anyway).
13
14 While not the cleanest, use a symlink to avoid patching files.
15
16 Closes: https://bugs.gentoo.org/806342
17 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
18
19 games-engines/box2d/box2d-2.4.1.ebuild | 9 +++++++++
20 1 file changed, 9 insertions(+)
21
22 diff --git a/games-engines/box2d/box2d-2.4.1.ebuild b/games-engines/box2d/box2d-2.4.1.ebuild
23 index 0fe84b500b2..aa15726dd78 100644
24 --- a/games-engines/box2d/box2d-2.4.1.ebuild
25 +++ b/games-engines/box2d/box2d-2.4.1.ebuild
26 @@ -15,8 +15,17 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
27 IUSE="doc test"
28 RESTRICT="!test? ( test )"
29
30 +DEPEND="test? ( dev-cpp/doctest )"
31 BDEPEND="doc? ( app-doc/doxygen )"
32
33 +src_prepare() {
34 + cmake_src_prepare
35 +
36 + # unbundle doctest
37 + rm unit-test/doctest.h || die
38 + ln -s "${ESYSROOT}"/usr/include/doctest/doctest.h unit-test/ || die
39 +}
40 +
41 src_configure() {
42 local mycmakeargs=(
43 -DBOX2D_BUILD_TESTBED=OFF # bundled libs, broken anyway right now