From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A47891382C5 for ; Sat, 27 Jan 2018 14:50:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D528FE087C; Sat, 27 Jan 2018 14:50:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2214E087C for ; Sat, 27 Jan 2018 14:50:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5361C335C2E for ; Sat, 27 Jan 2018 14:50:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E39CA1C8 for ; Sat, 27 Jan 2018 14:50:53 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1517064638.c271008f733b42327582844aced340354df9295e.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/binutils/binutils-9999.ebuild X-VCS-Directories: sys-devel/binutils/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: c271008f733b42327582844aced340354df9295e X-VCS-Branch: master Date: Sat, 27 Jan 2018 14:50:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c4734a36-625d-4297-a8ef-77b0b2f02bb1 X-Archives-Hash: 61a5f10c13acfbf47b03d2f1122d0993 commit: c271008f733b42327582844aced340354df9295e Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Jan 27 14:50:05 2018 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Sat Jan 27 14:50:38 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c271008f sys-devel/binutils: Introduce doc useflag Package-Manager: Portage-2.3.20, Repoman-2.3.6 sys-devel/binutils/binutils-9999.ebuild | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild index 3e4f54cd69b..a2db40c93a4 100644 --- a/sys-devel/binutils/binutils-9999.ebuild +++ b/sys-devel/binutils/binutils-9999.ebuild @@ -8,7 +8,7 @@ inherit eutils libtool flag-o-matic gnuconfig multilib versionator DESCRIPTION="Tools necessary to build programs" HOMEPAGE="https://sourceware.org/binutils/" LICENSE="GPL-3+" -IUSE="+cxx multitarget +nls static-libs test" +IUSE="+cxx doc multitarget +nls static-libs test" # Variables that can be set here: # PATCH_VER - the patchset version @@ -62,6 +62,7 @@ RDEPEND=" sys-libs/zlib " DEPEND="${RDEPEND} + doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex @@ -235,13 +236,8 @@ src_configure() { echo ./configure "${myconf[@]}" "${S}"/configure "${myconf[@]}" || die - # Prevent makeinfo from running in releases. It may not always be - # installed, and older binutils may fail with newer texinfo. - # Besides, we never patch the doc files anyways, so regenerating - # in the first place is useless. #193364 - # For older versions, it means we don't get any info pages at all. - # Oh well, tough luck. #294617 - if [[ -e ${S}/gas/doc/as.info ]] || ! version_is_at_least 2.24 ; then + # Prevent makeinfo from running if doc is unset. + if ! use doc ; then sed -i \ -e '/^MAKEINFO/s:=.*:= true:' \ Makefile || die @@ -252,9 +248,8 @@ src_compile() { cd "${MY_BUILDDIR}" emake all - # only build info pages if we user wants them, and if - # we have makeinfo (may not exist when we bootstrap) - if type -p makeinfo > /dev/null ; then + # only build info pages if the user wants them + if use doc ; then emake info fi