commit: 2daa70b566d006aa2cfba6e20842b7287766f5e5 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Tue Feb 12 23:31:18 2019 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Tue Feb 12 23:31:18 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2daa70b5
sys-devel/binutils: split USE="cxx" into USE="gold plugins" Reported-by: Dirkjan Ochtman Bug: https://bugs.gentoo.org/663776 Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> .../{binutils-9999.ebuild => binutils-2.31.1-r4.ebuild} | 14 +++++++++----- sys-devel/binutils/binutils-9999.ebuild | 9 ++++++--- sys-devel/binutils/metadata.xml | 2 ++ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-2.31.1-r4.ebuild similarity index 97% copy from sys-devel/binutils/binutils-9999.ebuild copy to sys-devel/binutils/binutils-2.31.1-r4.ebuild index 4e2bb0f4ec7..841412c05e2 100644 --- a/sys-devel/binutils/binutils-9999.ebuild +++ b/sys-devel/binutils/binutils-2.31.1-r4.ebuild @@ -8,7 +8,8 @@ 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 doc multitarget +nls static-libs test" +IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test" +REQUIRED_USE="default-gold? ( gold )" # Variables that can be set here: # PATCH_VER - the patchset version @@ -19,8 +20,8 @@ IUSE="+cxx doc multitarget +nls static-libs test" # for the patchsets # Default: dilfridge :) -PATCH_VER=2 -PATCH_BINUTILS_VER=9999 +PATCH_VER=5 +PATCH_DEV=dilfridge case ${PV} in 9999) @@ -42,6 +43,7 @@ case ${PV} in *) SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz" SLOT=$(get_version_component_range 1-2) + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" ;; esac @@ -174,10 +176,12 @@ src_configure() { cd "${MY_BUILDDIR}" local myconf=() + if use plugins ; then + myconf+=( --enable-plugins ) + fi # enable gold (installed as ld.gold) and ld's plugin architecture - if use cxx ; then + if use gold ; then myconf+=( --enable-gold ) - myconf+=( --enable-plugins ) if use default-gold; then myconf+=( --enable-gold=default ) fi diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild index 4e2bb0f4ec7..7debbc5c53e 100644 --- a/sys-devel/binutils/binutils-9999.ebuild +++ b/sys-devel/binutils/binutils-9999.ebuild @@ -8,7 +8,8 @@ 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 doc multitarget +nls static-libs test" +IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test" +REQUIRED_USE="default-gold? ( gold )" # Variables that can be set here: # PATCH_VER - the patchset version @@ -174,10 +175,12 @@ src_configure() { cd "${MY_BUILDDIR}" local myconf=() + if use plugins ; then + myconf+=( --enable-plugins ) + fi # enable gold (installed as ld.gold) and ld's plugin architecture - if use cxx ; then + if use gold ; then myconf+=( --enable-gold ) - myconf+=( --enable-plugins ) if use default-gold; then myconf+=( --enable-gold=default ) fi diff --git a/sys-devel/binutils/metadata.xml b/sys-devel/binutils/metadata.xml index 98c985e11c4..66f4f23df42 100644 --- a/sys-devel/binutils/metadata.xml +++ b/sys-devel/binutils/metadata.xml @@ -7,6 +7,8 @@ </maintainer> <use> <flag name="default-gold">Set ld to point to ld.gold instead of ld.bfd</flag> + <flag name="gold">Build ld.gold linker</flag> + <flag name="plugins">Enable plugin support in tools</flag> <flag name="multitarget">Adds support to binutils for cross compiling (does not work with gas)</flag> </use> <upstream>
