Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/timidity++/
Date: Wed, 22 Dec 2021 03:57:21
Message-Id: 1640142059.b48871811b67831bb9657d653af8b338239adbda.sam@gentoo
1 commit: b48871811b67831bb9657d653af8b338239adbda
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 22 03:00:59 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 22 03:00:59 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4887181
7
8 media-sound/timidity++: add configure workarounds
9
10 - Rename configure.in -> configure.ac
11 - Avoid dodgy configure tests (written for old autoconf, fragile)
12
13 Closes: https://bugs.gentoo.org/665600
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 media-sound/timidity++/timidity++-2.15.0-r2.ebuild | 17 ++++++++++++++++-
17 1 file changed, 16 insertions(+), 1 deletion(-)
18
19 diff --git a/media-sound/timidity++/timidity++-2.15.0-r2.ebuild b/media-sound/timidity++/timidity++-2.15.0-r2.ebuild
20 index b776c4681ac2..f0377e343868 100644
21 --- a/media-sound/timidity++/timidity++-2.15.0-r2.ebuild
22 +++ b/media-sound/timidity++/timidity++-2.15.0-r2.ebuild
23 @@ -3,7 +3,7 @@
24
25 EAPI=7
26
27 -inherit autotools desktop elisp-common systemd toolchain-funcs xdg
28 +inherit autotools desktop elisp-common flag-o-matic systemd toolchain-funcs xdg
29
30 MY_PV="${PV/_/-}"
31 MY_P="TiMidity++-${MY_PV}"
32 @@ -69,6 +69,9 @@ PATCHES=(
33
34 src_prepare() {
35 default
36 +
37 + mv configure.{in,ac} || die
38 +
39 eautoreconf
40 }
41
42 @@ -79,6 +82,18 @@ src_configure() {
43 # List by preference
44 local xaw_provider=$(usex Xaw3d 'xaw3d' 'xaw')
45
46 + # configure workarounds: configure.in here is written for an old version
47 + # of autoconf and upstream seems quite dead.
48 + #
49 + # 1. Avoid janky configure test breaking
50 + # ```checking for sys/wait.h that is POSIX.1 compatible... yes
51 + # ./configure: 7995: test: =: unexpected operator```
52 + export ac_cv_header_sys_time_h=yes
53 + #
54 + # 2. And yes, we expect standard header locations (this configure test is flaky for us too)
55 + # This avoids a bunch of implicit decl. errors which only happen with USE=-Xaw3d(?!)
56 + append-cppflags -DSTDC_HEADERS
57 +
58 local myeconfargs=(
59 --localstatedir=/var/state/${PN}
60 --with-module-dir="${EPREFIX}/usr/share/timidity"