Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/binutils-libs/
Date: Tue, 29 Oct 2019 00:00:25
Message-Id: 1572307196.763246f9f9c17c795b8a299e9d97347a81df9a28.slyfox@gentoo
1 commit: 763246f9f9c17c795b8a299e9d97347a81df9a28
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 28 23:59:46 2019 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 28 23:59:56 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=763246f9
7
8 sys-libs/binutils-libs: drop texinfo from DEPENDs, bug #622652
9
10 Don't crash the build if texinfo is not installed. It's a port
11 of a hack we have in sys-devel/binutils.
12
13 Reported-by: William Throwe
14 Closes: https://bugs.gentoo.org/622652
15 Package-Manager: Portage-2.3.78, Repoman-2.3.17
16 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
17
18 sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild | 7 ++++++-
19 1 file changed, 6 insertions(+), 1 deletion(-)
20
21 diff --git a/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild
22 index 1d047890a61..193bdfdaded 100644
23 --- a/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild
24 +++ b/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild
25 @@ -25,7 +25,6 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sp
26
27 COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
28 DEPEND="${COMMON_DEPEND}
29 - >=sys-apps/texinfo-4.7
30 nls? ( sys-devel/gettext )"
31 # Need a newer binutils-config that'll reset include/lib symlinks for us.
32 RDEPEND="${COMMON_DEPEND}
33 @@ -105,6 +104,12 @@ multilib_src_configure() {
34
35 ECONF_SOURCE=${S} \
36 econf "${myconf[@]}"
37 +
38 + # Prevent makeinfo from running as we don't build docs here.
39 + # bug #622652
40 + sed -i \
41 + -e '/^MAKEINFO/s:=.*:= true:' \
42 + Makefile || die
43 }
44
45 multilib_src_install() {