| 1 |
commit: c271008f733b42327582844aced340354df9295e |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 27 14:50:05 2018 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 27 14:50:38 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c271008f |
| 7 |
|
| 8 |
sys-devel/binutils: Introduce doc useflag |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.20, Repoman-2.3.6 |
| 11 |
|
| 12 |
sys-devel/binutils/binutils-9999.ebuild | 17 ++++++----------- |
| 13 |
1 file changed, 6 insertions(+), 11 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild |
| 16 |
index 3e4f54cd69b..a2db40c93a4 100644 |
| 17 |
--- a/sys-devel/binutils/binutils-9999.ebuild |
| 18 |
+++ b/sys-devel/binutils/binutils-9999.ebuild |
| 19 |
@@ -8,7 +8,7 @@ inherit eutils libtool flag-o-matic gnuconfig multilib versionator |
| 20 |
DESCRIPTION="Tools necessary to build programs" |
| 21 |
HOMEPAGE="https://sourceware.org/binutils/" |
| 22 |
LICENSE="GPL-3+" |
| 23 |
-IUSE="+cxx multitarget +nls static-libs test" |
| 24 |
+IUSE="+cxx doc multitarget +nls static-libs test" |
| 25 |
|
| 26 |
# Variables that can be set here: |
| 27 |
# PATCH_VER - the patchset version |
| 28 |
@@ -62,6 +62,7 @@ RDEPEND=" |
| 29 |
sys-libs/zlib |
| 30 |
" |
| 31 |
DEPEND="${RDEPEND} |
| 32 |
+ doc? ( sys-apps/texinfo ) |
| 33 |
test? ( dev-util/dejagnu ) |
| 34 |
nls? ( sys-devel/gettext ) |
| 35 |
sys-devel/flex |
| 36 |
@@ -235,13 +236,8 @@ src_configure() { |
| 37 |
echo ./configure "${myconf[@]}" |
| 38 |
"${S}"/configure "${myconf[@]}" || die |
| 39 |
|
| 40 |
- # Prevent makeinfo from running in releases. It may not always be |
| 41 |
- # installed, and older binutils may fail with newer texinfo. |
| 42 |
- # Besides, we never patch the doc files anyways, so regenerating |
| 43 |
- # in the first place is useless. #193364 |
| 44 |
- # For older versions, it means we don't get any info pages at all. |
| 45 |
- # Oh well, tough luck. #294617 |
| 46 |
- if [[ -e ${S}/gas/doc/as.info ]] || ! version_is_at_least 2.24 ; then |
| 47 |
+ # Prevent makeinfo from running if doc is unset. |
| 48 |
+ if ! use doc ; then |
| 49 |
sed -i \ |
| 50 |
-e '/^MAKEINFO/s:=.*:= true:' \ |
| 51 |
Makefile || die |
| 52 |
@@ -252,9 +248,8 @@ src_compile() { |
| 53 |
cd "${MY_BUILDDIR}" |
| 54 |
emake all |
| 55 |
|
| 56 |
- # only build info pages if we user wants them, and if |
| 57 |
- # we have makeinfo (may not exist when we bootstrap) |
| 58 |
- if type -p makeinfo > /dev/null ; then |
| 59 |
+ # only build info pages if the user wants them |
| 60 |
+ if use doc ; then |
| 61 |
emake info |
| 62 |
fi |
Archives